Fix issue with builtin.xml and missing support for builtin functions.