This appears to work, but I'm not happy about it.
Rubocop touchups