Object-oriented reorg. Improved handling of silent e.