Remove a potentially large concat operation, and change some comments.
Merge origin/master