Canonicalise output format a bit