Missing review fixes from #173.