Become binary-safe. Now works on (and returns) buffers