NullValue -> Null
Tidy up formatting of the grammar.
Reinstate func_registry, for back compat.
Make this function name check hack work with other callables.