Improve setter/getter/field conflict detection (minor regression from 1.8)

3 files changed