Re #1256 Output format tweaks.