x/|x| isn't that big a deal and the logic was a gigantic mess

If we use the old velocity, it can happen that we hit the kernel of
the singular norm component