Big simplications in use of base class, thanks to Phil Dennis <phil@booksys.com>