Turn on solver code, remove problematic exception specifiers