Re-committing the failed r97807 commit with changes to eliminate warnings.