[Core] Properly roundtrip project items that contain property references