More code clean up.

No match.