This avoids a limitation set by the nag compiler on the number of line
continutations.
This also makes a number of updates to code comments.