removing some complexity

[phoet]

i was browsing the code a bit, but i thought it was rather hard to understand what's going on because there are many levels of indirection.

this change is just an example of how simple the code actually is, but it's extracted into a class where i don't necessary understand why it's in there.

if there were any unit-tests, i guess this would become more obvious. are you interested in extending the current test suite by such a set of tests?