Transition step towards removing some DP variables.