Add fallbacks for expression resolution (fix #8478)