Small tweak to support empty PropertyValues
Merge branch 'parsing_improvements'