When @Named parameter matches name in Example table, it might be injected for steps that do not reference it

@Test
public void shouldNotCreateStepFromTableValuesViaAnnotations() throws Exception {
    AnnotationNamedParameterSteps steps = new AnnotationNamedParameterSteps();
    // Parameter values from Examples: table should NOT be used in this test.
    // When removing the next two lines, or when using a different name for "ith",
    // then all is fine:
    namedParameters.put("ith", "top");
    namedParameters.put("nth", "penthouse");
    // Even with the above namedParameters as provided, then the following pattern
    // works fine if $ith is fully surrounded with whitespace, like:
    //   String patternAsString = "I live on the $ith but some call it the $nth";
    // ...but not when a comma follows the parameter name:
    String patternAsString = "I live on the $ith, but some call it the $nth";
    Method method = stepMethodFor("methodWithNamedParametersInNaturalOrder", AnnotationNamedParameterSteps.class);
    StepCandidate candidate = candidateWith(patternAsString, WHEN, method, steps);
    candidate.createMatchedStep("When I live on the first, but some call it the ground", namedParameters)
            .perform(null);
    // Will fail in 3.5.4:
    // java.lang.AssertionError: Expected: "first" got: "top"
    assertThat(steps.ith, equalTo("first"));
    assertThat(steps.nth, equalTo("ground"));
}

@Test
public void shouldNotCreateStepFromTableValuesViaAnnotations() throws Exception {
    StoryReporter reporter = mock(StoryReporter.class);
    AnnotationNamedParameterSteps steps = new AnnotationNamedParameterSteps();
    // Parameter values from an Examples table should NOT be used when the step
    // does not refer to <ith> and <nth> but gives specific values instead. But
    // in 3.5.4 and 3.6 SNAPSHOT the specific values are ignored if they happen
    // to use the same name as used in the Examples table.
    // When removing the next two lines, or when using a different name for 
    // BOTH "ith" and "nth", then all is fine. (In 3.5.4, only "ith" needs to
    // be removed or renamed; in 3.6-SNAPSHOT both.)
    namedParameters.put("ith", "top");
    namedParameters.put("nth", "penthouse");
    // In 3.5.4, even with the above namedParameters as provided, the following
    // pattern only failed when some non-whitespace followed the parameter, like
    // when adding a comma after "$ith":
    //   String patternAsString = "I live on the $ith, but some call it the $nth";
    // In 3.6-SNAPSHOT, this fails without that comma too, and also for $nth:
    String patternAsString = "I live on the $ith floor but some call it the $nth";
    Method method = stepMethodFor("methodWithNamedParametersInNaturalOrder", AnnotationNamedParameterSteps.class);
    StepCandidate candidate = candidateWith(patternAsString, WHEN, method, steps);
    StepResult result =candidate.createMatchedStep("When I live on the first floor but some call it the ground", namedParameters)
            .perform(null);
    // Will fail in both 3.5.4 and in 3.6-SNAPSHOT:
    // java.lang.AssertionError: Expected: "first" got: "top"
    assertThat(steps.ith, equalTo("first"));
    // Will fail in 3.6-SNAPSHOT:
    // java.lang.AssertionError: Expected: "ground" got: "penthouse"
    assertThat(steps.nth, equalTo("ground"));
    result.describeTo(reporter);
    verify(reporter).successful(
            "When I live on the " + PARAMETER_VALUE_START + "first" + PARAMETER_VALUE_END + " floor but some call it the " + PARAMETER_VALUE_START + "ground" + PARAMETER_VALUE_END );
}

Then I see <b>
And I saw 'bar'

Then I see that
And I saw 'bar'

Scenario: Combination of variable and example-data
When user sets 'usernameField' to <value>
When user sets 'passwordField' to <value>

Examples:
value
username
password

@When("user sets '$fieldname' to <value>")
public void whenUserSetsUsernameFieldTovalue(@Named("fieldname") final String fieldname, @Named("value") final String value) { 
   System.out.println(fieldname + value); 
}