Some code refactoring, etc.

No match.