More Closure type annotations.

Change-Id: I8d1d4af37add37a5512017cdd3dccade1ccf6d9e
Makefile: add clean target

Change-Id: I4ec279e3e39fe5388d75f694542149d72d588d49