performance tweaking for wrapNoConflict
performance tweaking for wrapNoConflict


Former-commit-id: 5cc40edc794b4ea17207e712600ef8297b684c07 [formerly 321b3dcca10d8def6bdc5e452b9a090e2e8e8b3d]
Former-commit-id: bc9fef5ec6eb2043c19e4666d03d66bc1485eebb
romancow/Sugar,andrewplummer/Sugar,romancow/Sugar,andrewplummer/Sugar