Can't use WithEntry on a custom State subclass

[canton7]

If you've got a custom subclass of State, for one state only, you can't use WithEntry on it, because it returns State rather than your custom state subclass.

Not sure if there's a good solution to this....