Give functor composition a more HoTT-style definition, and improving some unfolding behavior