Diffs look good, this is OK to merge if someone has checked that it's not introducing bad linebreaks or similar. (We've had overfull hboxes in this area previously, as I recall.)

Current HEAD show one overfull hbox with "fgrep -e Overfull -e .tex std.log":
Overfull \vbox (4.77557pt too high) has occurred while \output is active []

This branch, rebased on the HEAD, shows only that very same overfull hbox.

diffpdf shows no bad linebreaks for the changes, either.

@jensmaurer: Your so-called "hbox" has self-identified as a "vbox" and would like you to treat it as such.

Dear vbox,

Please accept my sincere apologies for mistreatment as a hbox.

Jens

Looks all good, no hboxes were disrespected as part of this pull request.