  Rewrote storage options as a class-factory and subclasses.
  Rewrote storage options as a class-factory and subclasses.

  This is much less nasty.

skx/e-comments,skx/e-comments,skx/e-comments,skx/e-comments