Comment 1 for bug 522497

All of the four places above might need unification, though it probably works fine as it is right now for 3 and 4 (I've added them for completeness)