fix: move canonicalizer state to `Goal`
3 files changed