Random cleanup around our usage of binary_type (#879)

3 files changed