Some cleanup in ForInContextSelector; now renamed to
ParameterNameContextSelector.