More property expression handling enhancements