Fixed handling of arguments needing match.arg.