[53] Minor fixups to previous commit.