Issue #27: Continued massive refactoring, a lot of simplifications, work still not done.