Remaining fix for dispatch_get_current_queue() deprecation