Switched to the usage of Simple(Property|Association)Handler to avoid having to use raw PersistentProperty instances.