Fix packaging.
Distinguish builtins from other functions.