- remove old XXX comments: we have added information on schema, and
  no, we really don't want to talk about "handlers" -- they're evil