Fixing busted conditionals

Hello jon, 

Please review the following commits I made in branch 'jfuchs-test-define-in-builder'.

15b4d2b5c36701624afb52ed91eac18605504191 (2013-04-10 12:22:58 -0700)
Fixing busted conditionals

953b6cf0d3f0c21f57090f978c159b4b86cda2d6 (2013-04-10 11:48:16 -0700)
Created a test which fails when using define() in a builder

R=jon