Switched the const back to defines.