Sounds like too big a change for this PR... let's integrate it as it is.