a couple of small cleanups to macros
a couple of small cleanups to macros

spgarbet/pysb,spgarbet/pysb,d-fan/pysb,alubbock/pysb-legacy,alubbock/pysb,johnbachman/pysb,neurord/pysb,LoLab-VU/pysb,alubbock/pysb-legacy,d-fan/pysb,LoLab-VU/pysb,jmuhlich/pysb,d-fan/pysb,spgarbet/pysb,alubbock/pysb-legacy,neurord/pysb,johnbachman/pysb,pysb/pysb,alubbock/pysb-legacy,neurord/pysb