Minor fixups to make my code tolerable.