Fix a few mistakes.

Remove options from the class def as storing mutable types in class defs
is a bad idea.