simplify functoriality proofs