More Closure annotations. Down to 17 warnings.

Change-Id: I9671072d9020e37c95be8dcdf8574017ccd3457d
More type annotations. 16 warnings.

Change-Id: I67350719305279c0d3e7c3869f53476f56f256a4
More closure annotations. Down to 12 warnings.

Change-Id: I40bd64d02c94b52eac7f522e52b694266163ea93