FIX: Compile error
CODE: Further minor optimisation of private car routing
REVERT: Previous optimisation (does not work well with static system)