Minor code tweaks pre pull request 8.