Moved a define out a conditional.  USE CODE COLLAPSING!