Correct the names of those methods

- even if they worked because that decorator is kind of magical.
Implement support for options

- First very rough cut.  Have to figure out whether or not we have every
  custom attributes per object type show up consistently or on demand.