Initial commit (collapse history for a major cleanup).