Comment 6 for bug 853658

You're right, that's definitely a layer8 problem on my part :)

Marking the bug as "Fixed committed", the other change is a separate usability enhancement.