Refactored .then implicit unwrapping to be done by the continuation