Cleans up formatting inside expander and matchPatterns.
Merge branch 'feature/case-macro-matchPatterns' into nflx