Whitespace and single quotes
Use list.insert
Merge pull request #8045 from holmboe/minor-fixups

Minor fixups