better parsing for special cases (inline classes, if without {),
better feature location.