Cleaning up some misc. things.
Rebasing with the merge.
Test cleanup.