fix [always]CalledWithMatch when used with expect

those two were not working when using expect() syntax because the expectation
name was duplicated.