keygend frequently doesn't realise new keys need to be generated

The mechanism used to determine if new keys need to be generated is too simplistic. Counting zones and keys doesn't appear to work correctly. I have to modify the code to make it think some more keys need to be generated.

This shows up most often when adding a single zone, and it may be also be caused by removing and then adding a zone.