Simplified property type plumbing
Merge remote-tracking branch 'JSONMarshal/master'