Simplify early return condition

Improvements to formula/bottle integration means we can be less
defensive here.