CODE: Substantial rationalisation of passenger generation code, including fixing a few anomalies/bugs introduced by the previous walking passengers work.