Improve handling of inline pragmas, esp where type applications are involved