More scripting changes:
TODO: Overhaul scripting system again - Implement dynamic parameter evaluation, reduce code reuse.