Fix catch-related breakage. Make -Wall happy.