More formatter fixes/enhancements

Signed-off-by: Chris Bunney <chris.bunney@dsp.io>