Adjust exceptions to recent change to +[className].