Fixed bug with storage delimiters

Turns out my method was a little over complicated, cut it down and now
things work much smoother.