Rewrite internal state using mechanical approach to GADTs

[polytypic]

This essentially uses the pattern described in the gist A pattern for using GADTs to subset cases.