tweak the macros so they bind properly within an enclosing if/else construct
tweak the macros so they bind properly within an enclosing if/else construct

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion