Small simplifications regarding SrcTy vs Ty and SrcCTy vs CTy.