CHANGE: Simplify and optimise handling of overcrowding in the passenger generation code.