Some clarifications and minor fixes that I overlooked in #1509.
Commit 915b98fd fixes this pull-request
Pull-Request has been merged by james
Some clarifications and minor fixes that I overlooked in #1509.