Don't check for token matches where we already know what it should be (fix #280)