Fix closure type warnings
Fix closure type warnings

Using @interface declarations would seem to be preferable to doing it
this way, but at least this works for now.

NeilFraser/CodeCity,NeilFraser/CodeCity,NeilFraser/CodeCity,google/CodeCity,google/CodeCity,NeilFraser/CodeCity,google/CodeCity,google/CodeCity