Fixups from beb92fc.