Fix some showfor macro calls.

This should fix most of the "showfor isn't showing up" bugs we have, including bug 946314.