Another fix for r264274.  Last moment cosmetic changes are evil!