I still think it's broken. But at least it can be broken & typesafe before we replace it :)