Git rid of some PMD warnings in Universe.