Refactoring a bit of the excuse loading to try to find the broken location bug.