Simplify control flow
Upgrade to airlift 0.71