Disease extent generation tidy-ups

See commit messages
Nope - thanks!