#127 Working around broken Eclipse implementation of Types#asMemberOf()
#120 refactoring first attempt after feedback. Making a clean overview by squashing earlier commits on 120. Rebasing master.