Revisit relevant rules. A couple of rules should re-enabled after addressing the respective issues in the current code.