Disease extent generation tidy-ups

See commit messages
Intentional empty line?