Implement orUntil and do some linting.

Fixes #2.