More progress in Functor.v