Fix compiler and checkstyle warnings.
Bring property names into line with matched properties in
example matcher class AddressMatcher.