Getter-setter generator now picks correct insertion points.