Improved lookup environment silliness.