Closure annotation fixup