nullable
#1022: rework variable resolution