I agree with this refactoring. But it will make the InstantiatedContract class "anemic". So I think we can remove it entirely.