Rare game-killer bug fixed, probably

Level generation could result in infinite loops before.  Some key
changes may have fixed that.