Fix case where delimiter is split across multiple reads.

Also remove invalid TODOs and re-prioritize unimport TODOs to (someday)