Here's a complete patch that combines the various incremental patches
that have been going around. I'm testing this now.

Please take a look.