=par more shapeless strip-down and comment cleanup

Follow up to #15867.