Scripting/Multi: Some cleanup.