Unified solution for split delimiters

Right after you merged this I figured out a way to handle this fairly quickly in a unified way. We should benchmark it again, but I think it's solid.