Redmine/6569

Treat unexpanded functions and unexpanded variables equally in and/or classes promises.
`shortcut "and" and "or"` would make it clearer that the quoted words are operators being named while the conjunction between them is part of our sentence