Merge branch 'binary_always_binary' into simpler_separating
Remove todo for is_whitespace, as it complies with RFC 4627.
Tidy up separator tracking a little.
Merge branch 'pr/4340'