More formatter fixes - see #436