Performed code changes as per review of rpav. Added WITH-POINTS such
that it is similar to WITH-RECTS.