More bug fixes. Don't use $ST anymore as that is buggy to say the least.

Delimiting by comma doesn't work as vars have comma in them. Discuss
with Joel.