Add support for output.canonical = full