Apply eta-expansion to differenciate functions from global variables
Remove unused functions from the Builtins C++ implementation