Various cleanup
Start to convert some transformers to the new matcher system