More binary resultset parsing tweaks for string/octets

Re-merge binary and string types, use encoding to determine if the
result should be given as octets or as a string.