Comment 4 for bug 1031803

Turns out that my second patch doesn't correctly handle aliases which expand to a non-existent local user, so in that case, my first patch may be preferable.