Comment 4 for bug 406851

Heh. Wasn't going to fix it, but was scrolling past and saw it was a quick job. Merge is up to you; I cleaned up dismiss() for clarity while I was at it, so feel free to cherrypick that or merge the whole lot, whichever works.