Various and assundary formatting fixes (bug #3174)