Redmine/6569

Treat unexpanded functions and unexpanded variables equally in and/or classes promises.