Fix m4 badness
Merge pull request #201 from dmcdougall/fix-m4

Fix m4 badness