note aexmachina's change, style tweaks for make check