Add ability to override subtype on macros