Merge "Fix special getter/setter generation."