Slight refactoring around custom delimiter building