Simplified mux to make gate counts comparable to prototype version.
Could change back for clarity once keyhole optimizations are implemented.