Tweak special-case output for better code-generation mode