fixup! Test and improve pasting