This brings it in line with recommended practice after the introduction of sub-operand naming in a538d1f1, and the deprecation of positional argument matching in 5351878b.