Fixes #2610 - Replaces variable functions with call_user_func()