Add repl changes for canonical form