These patches have been sent before, but the discussion was sort of inconclusive and now there is a fresh git repo. So here are the last remaining patches from my set again, freshly rebased on top of master. Diego