More changes to TwoD_IT_w_TopK public interface.