strict equality where needed
strict equality where needed


Former-commit-id: d95fe7b68d2a0bb7652b7cae220bc761de0a0ea1 [formerly dd2758318c7acf1d9d813a90608ba654898c13c6]
Former-commit-id: b6794da3a3c1c59cd5825128d9b00e5374c4c8f4
romancow/Sugar,andrewplummer/Sugar,romancow/Sugar,andrewplummer/Sugar