Switch to using is_binary guard