Edited comments and minor adjustments. Fixes #13553. Closes gh-1195.