Cleaning up a bit to get back inline with upstream
Cleaned up.  Ready to branch.