#111 Minor tidy after pull request #122.