I've just made a large number of commits to trunk. I've had these sitting in my patch stack for a while and they seem to work with me. But pretty much lots of commits == lots of exciting new bugs to discover. Please find them for me. --