This passes all test, yet is still broken and ugly in many ways.
However, a lot of ugliness has been removed.
Authored by: adustman 2010-02-20
Parent: [r637]
Child: [r639]
