Add support for latest version of exceptions
Remove several INLINE pragmas