More refactoring of ParameterNameContextSelector, which is now called
PropertyNameContextSelector.