Removed a couple of duplicated macros.