Replace --Norm with general but reasonably efficient --format using

Replace --Norm with general but reasonably efficient --format using #131