Update files for pr #807 to match current quality checks.