simplify the code (and increase the test coverage)

the %method_map is not needed, since the special case is already
handled in a special way