Are these order changes were required, if we're not using _buildCfg to move modifyAttrs over?