Use simpler line address logic from Acme.

It's not much simpler, but I feel like it's more straight forward in the edge cases.
It's also a tiny bit shorter.