slight perf optimization
slight perf optimization


Former-commit-id: 27a4b80ccc9c2e2fb4da4d249d6319d3720ed0b4 [formerly 5e59fd7505866feda2cbe8de2602341b1766b233]
Former-commit-id: 3dd8dfc2096e4280f1ec45035b67b07e9971443e
andrewplummer/Sugar,romancow/Sugar,andrewplummer/Sugar,romancow/Sugar