Making all prefer-binary bits consistent

I'm sneaking this in, yes.  Sorry.  I can break it into its own PR if needed.