case where the type in the following declaration is specified as a template-id, and refactor for clarity. llvm-svn: 195280
when we're in an Objective-C container context. Fixes <rdar://problem/11286701>. llvm-svn: 155836