Final cleanup & changes from SVN.