Expressions: improve expression vs property detection