revoke call to cg-optimize
add tail closure call optimization