Strategy 2 - Code doesn't reflect conversations

If your code and your conversation about how things work are different...

Refactor. The code is trying to do stuff in a different way. Probably it has evolved from a point where it described exactly what the user specified. Along the way special cases were added and more functionality. Now that your understanding has evolved so can your code.