Making all prefer-binary bits consistent

Addressed in #91.