Decrease inheritance and overloading for PropertyValueSnak

What cycle? Both are in the same component. Entity and EntityId are in the same namespace. This class already uses EntityId. Could it be that the constant is in the wrong class and should be in EntityId instead of Entity?