Consistently use row/col. No more x/y.