Improve unitDelimited

Fixes #659 and also handles a few extra cases.