More HoTT code style cleanups.