pmd: remove unnecessary return
pmd: consolidate collapsible if statements.

Sometimes two 'if' statements can be consolidated by separating their conditions
with a boolean short-circuit operator.
Merge pull request #311 from candlepin/morepmd

pmd: remove unnecessary return and consolidate if statements