Slight reduction in macro usage

Saved a couple of kittens, I guess
got rid of some code duplication