Revert "Revert "Removed PartyProxy as a subtype of Locatable.""

This reverts commit 739c3c61fe0b5773befde4c3a09f3b5ef08dc8e3.