Update to new control data layout and shorter paths.