Remove a terminal case it's not possible to hit, and make sure we wrap lim() everywhere we need it.
More tests.