Added more re-raises, formatted files.