byacc-noconflict: Fix style.
zmap: Clean up.