Switch to using an explicit scope object to ensure we don't forget to pop ObjC

type parameters off the scope, and fix the cases where we failed to do so.

llvm-svn: 251875