Comment 3 for bug 1193342

This simplifies and refactors MatchProperty(), and fixes the GValue leak.