Fixed arguments processing in handlers (defaults, etc.)