Stephen: I've dropped this patch out and pushed a revised tree as well soit doesn't block other folks.