Only compile unicode buck reviewed

I basically had to walk though all of your changes in order to review.
I made these edits while I was doing so.