Rename keep() to capture()
Testcases for or(), start using _state
More state tracking; enough to replace helpers
A bunch of cases for repeat()
Add some cases that use macro() family methods