Perhaps that's something for a later enhancement. For now I'd rather not introduce any more changes to this pull request than are necessary.