Unify disparate point and rect types