Port space after comma etc

Ouch! Painful merge. :-)

I changed a lot of things back. Adding tokens parameter again. I think tokens are needed, and we can have them. It's just a little bit ugly for now.