Cleaning up errors I introduced with search-and-replace, and with marmalade scripting support. I'm marking marmalade support out for now, until I can get that stuff dragged back into the present.