Refactored `Polymorphic` mixing (plus fixed some forgotten `hybrid_property` issues)