Improve `TypeUtils` testing.
Update project to flatten macros better.