Remove extra unnecessary maybeThenable check
Extract promise cycle handler to function so stack traces make sense