Fix some basic Closure type annotation mistakes