Fix until

Was causing crashes. Due to calling then with nil.

The whole thing is a bit nuts. Should probably be removed or at least, radically rethought. It’s not intuitive, and has code smells about it.
COME ON NOW. NO MORE SEMICOLONS.
Workaround `catch` ambiguity; Refs #56