Several simplifications reviled after testing.