ScopedCommands is now working as expected after chasing down bugs.