Nasty but now supports static closures