Removed unnecessary arguments for walk_* functions