Renaming.
Use existing efficient method to build intersection for select variables.
Clean up. Remove unused elements.
Bug fix.