Stage-1 shouldn't know anything about `next-reg`. Improved tests.