Fixed lack of required CBA dependency.
Moved the last loose functions into the CfgFunctions.