check_args_beyond() {
     _N_MAX_ARGS="$1"
     _CMD="$2"
-    shift "${_N_MAX_ARGS}"
+    shift "$(calc '${_N_MAX_ARGS} + 2' | cut -f2)"
     if [ "$#" -gt 0 ]; then
         _MSG="unexpected arguments beyond command '${_CMD}': $@"
         error_exit "${_MSG}"
 if [ "$#" -lt 1 ]; then
     error_exit_with_usage "missing command."
 elif [ "$1" = "${CMD_CLAIM}" ]; then
-    check_args_beyond 2 "$@"
+    check_args_beyond 1 "$@"
     cmnd_claim "$1"
 elif [ "$1" = "${CMD_HELP}" ]; then
-    check_args_beyond 1 "$@"
+    check_args_beyond 0 "$@"
     print_usage
 elif [ "$1" = "${CMD_KEYS}" ]; then
-    check_args_beyond 1 "$@"
+    check_args_beyond 0 "$@"
     cmd_keys
 elif [ "$1" = "${CMD_ORGPULL}" ]; then
-    check_args_beyond 1 "$@"
+    check_args_beyond 0 "$@"
     cmd_orgpull
 else
     error_exit_with_usage "unexpected command: ${1}"