Completely eliminated the task-based completion handlers, moving to an entirely notification-based system.  This approach also eliminated a potentially unnecessary network call.