Fix the bicolor stuff a better way.

Sharing code wasn't making sense.

This gets rid of some glitches on the output.