Restore Davide's identification of macro fileswhen reporting errors.