Cleaned up redundant #defines.