Fix m4 badness

Fixes #199 and #200.  Kapow.