fdo#77379: Write test for this.

Change-Id: Iccc0b499abae90f5b780aebab17ff6315b5690ec
fdo#77379: Don't return from the call. Notes are handled at the end.

Returning prematurely would end up skipping pasting of notes.

Change-Id: I79e0968023342a68fe729f31eb6cfc3cfacd5850