Follow rename from state_arg to simply arg