I'm not certain that our treatment of `-1` is correct but that sounds like an improvement all the same :)