Convert Simplify into a plugin
Convert Canonicalize into a plugin