Only store the field information once.

Don't use an orswot for schema and a dict for values as this
duplicates field information. Instead duplicate the orswot logic