Update: rework delimit management to ensure delimits are only applied when valid.

Update: rework delimit management to ensure delimits are only applied when valid.

This unfortunately increases the complexity slightly as deallocation must occur before functions exist.
On the other hand doing so avoids overly complicated loops that would probably make the code less readable.