Minor Fixes

- Change token to be something other than a comma (this was getting in
the way of larger automated replaces)