Refactor PatternMatcher internals
Move the remaining haml matchers