Further tidying up of loco/train split
Fixes to make LocoControlledBy work