Clean up handling of strings vs bytes a little bit.