Some const cleanup in exception catching