Allow optional arguments in method shift_arg
Fix handling of optional arguments after GLI conversion

Optional arguments where treated as required after the conversion to
GLI.