I'll repeat what i said on the bug
FWIW: Given the choice, i would much rather fix the underlying problem then patch various passes to work around some small subset of it (here, load of selected addresses)
This is underway right now, actually.
I would be more amenable to the latter approach if there was data that we could get, say, 90% of the gain of changing the canonical form by doing so.
I have doubts this is the case, but if you've got data that says it is, ...