Improve support for x2, y2 properties (#63).