Remove specification of unnecessary (implied) qualifiers
Move PMD suppression further up to catch more issues in generated code