Should I switch back to the old function system?

It's better to move to the new built-in Functions feature. It helps you make your project events modular and the functions can be easily looked up.

Although, I do not recommend Function Maps, use the Scripting Feature for string based Function calls.

> 	runtime.callFunction("functionName", param1, param2, param3, ...);

I hope that helps.

Hmm, I'll give that a try, thanks. That could really trim some of my code.

Note if you use scripting to call a function by a string of its name, it will break if you rename the function. With function maps, it keeps working even if you rename the function.