Cleaned up redundant code in defines.