Override tokenfield swallowing of comma to allow it in expressions