Preserve comments and empty lines in bookmark list

Preserve comments and empty lines to allow for better orientation in
the merged list.