Resolve several linting errors

What does this MR do and why?

I want to move these classes to the correct bounded context, but it seemed sensible to clean up the outstanding Rubocop TODOs first.

MR acceptance checklist

Evaluate this MR against the MR acceptance checklist. It helps you analyze changes to reduce risks in quality, performance, reliability, security, and maintainability.