Further enhancements to the clang parser