More work on the scripting framework.