Incremental commit of NSOperation/wait spinner refactor