Improved independence on PendingCommandState further.