Simplify merge-note code.