more performance changes
more performance changes


Former-commit-id: e8eca0290c46141e559ea11366caea003d1cac32 [formerly 623f5a5c2616d2cf0b6f814cda2bd1f4175002b0]
Former-commit-id: 35ef2e7b643e519c4c996217dbdbacb290be131f
andrewplummer/Sugar,andrewplummer/Sugar,romancow/Sugar,romancow/Sugar