Cosmetic corrections in some of the files from the previous commits.
Authored by: j-lamm 2019-10-21
Parent: [r214]
Child: [r216]