Fix unstable formatting of trailing callback comments

Fix unstable formatting of trailing callback comments #10982