First merge screw up: I meant to comment these lines out (as they area
now -- in fact, these lines did not exist pre-merge at all, I moved the
-DRELEASE_BUILD additions manually to their own lines, so I could
comment them out, and then promptly forgot. *sigh*)
On the pro side, it was very easy to spot and correct this mistake!