Bug 870095 - Follow-up: use ReorderCommutative() in more places. r=h4writer