Correct misaligned "ends" caught by Rubocop
Rubocop: allow LiteralInInterpolation enforcement
Rubocop: allow AmbiguousOperator enforcement
Fix a couple of ambiguous uses of &block parameters
Rubocop: allow ConditionPosition enforcement
Fix "single line" conditionals that were broken into two lines