I forgot to say that this is a bugfix candidate. If no one beats me to it, I'll backport these fixes to 2.2 and 2.1. Jeremy