If we're gonna do this...

Fix state `__init__`s.