better context variable recognition