SQUASH/make code clearer

At the expense of one line. For a decent optimizing compiler, I think we
just saved 2 bytes of copying...