JAL-2629 adjust placement and optionality of arguments/options