remove ugly operator()-hacks