Refactoring: don't eval string

Every time I looked at that code it bugged me. Finally decided to just get the ref to the overridden method
and just use blocks.