Simplify MAKE_BINARY_PERCOMPONENT_OP and MAKE_BINARY_PERCOMPONENT_VF_OP

It's not even as extensive a change as the diffs appear -- the amount of whitespace before the brackets changed to keep things aligned.