Update expected results for harmless canonicalization of bugs that this actually fixed.