Among other things, grabs support for `@optionalTypeArgs`.

This is the last dev push for 1.16.  Here on out we're in cherry-pick season until 1.16 final.