By rewriting a few stanza's to give the compiler more flexibility in
order of operations, reduce code size by about 1kb.