Builtin script improvements.