Cleanup/fix bugs for reading in mapping files.