Fixed clobbering of match-data

insert-file-contents clobbers match-data, so surround all invocations
with save-match-data.