Simplify MAKE_BINARY_PERCOMPONENT_OP and MAKE_BINARY_PERCOMPONENT_VF_OP