Eliminate PMD errors.
Move into normal tree, add more property samples.