Reference ahead of some minor changes to repeat handling
All but 2 tests passing again