Minor cleanups for baselining
Locations used their old message without prefix, so when the locations
are copied the new message should be used.