Many changes to get things generally in step with the SharePoint
repository.