Refs #3809 - Fix a few rubocop TODOs