You can just pop the class matching check in here, then you don't need the new MatchingBlock:Class: method above