Niels tweaks.
More built-in functions.