chomping issues, a spurious   in an email template, and minor
rewordings to make the text prettier -- oh, I realize this isn't Chaucer
yet, but who knows? r=jouni, a=justdave.