Removed two pointless and obfuscating macros.