Removed 2 Mux16s, one via simple reflow, the other by adding And16x1.

I'm sure there are further removals to be had, but, for me, this
strikes a nice balance between readability, design comprehension, and
optimization.