replace wrong TypSafeMatcher
tidy up decorators