Added explainary comments to TypeMatcherMacro and some minor cleanup.