It started with one corner case, then I found more, then I found new
potential corner cases introduced by my own attempts at squaring them.

I decided to take a step back and start some VAV test coverage. With
something not too complicated to edit, dealing with the corner cases
should increase confidence with the introduction of new cases easy
to review.