Improve handling of multiple margin notes using marginfix package