Avoid naming clashes in option values

Fixes #90.
Also replace any at-signs