Cleanup.
More cleanup.
Merge branch 'master' into inedit