auto-ifications, simplifications in transport code