clean up some x/y -> row/col madness