Fixed some illTyped false positives.
Removed redundant macro imports.