Resolve failing rubocop issues

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-08-27 22:42:50 +1000 using RuboCop version 0.74.0.
+# on 2019-08-29 00:43:36 +1000 using RuboCop version 0.74.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -46,7 +46,7 @@ Layout/ClosingHeredocIndentation:
   Exclude:
     - 'test/integration/tags/for_tag_test.rb'
 
-# Offense count: 25
+# Offense count: 27
 # Cop supports --auto-correct.
 Layout/EmptyLineAfterGuardClause:
   Exclude:
@@ -104,7 +104,7 @@ Lint/Void:
   Exclude:
     - 'lib/liquid/parse_context.rb'
 
-# Offense count: 52
+# Offense count: 53
 Metrics/AbcSize:
   Max: 56
 
@@ -112,7 +112,7 @@ Metrics/AbcSize:
 Metrics/CyclomaticComplexity:
   Max: 13
 
-# Offense count: 114
+# Offense count: 118
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 38
@@ -144,11 +144,12 @@ Naming/UncommunicativeMethodParamName:
     - 'test/integration/template_test.rb'
     - 'test/unit/condition_unit_test.rb'
 
-# Offense count: 3
+# Offense count: 5
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: inline, group
 Style/AccessModifierDeclarations:
   Exclude:
+    - 'lib/liquid/block_body.rb'
     - 'lib/liquid/tag.rb'
     - 'lib/liquid/tags/include.rb'
     - 'test/unit/strainer_unit_test.rb'
@@ -220,7 +221,7 @@ Style/FormatStringToken:
     - 'test/integration/filter_test.rb'
     - 'test/integration/hash_ordering_test.rb'
 
-# Offense count: 103
+# Offense count: 106
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, never
@@ -244,7 +245,7 @@ Style/GuardClause:
     - 'lib/liquid/variable.rb'
     - 'test/unit/tokenizer_unit_test.rb'
 
-# Offense count: 52
+# Offense count: 53
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: literals, strict
@@ -336,7 +337,7 @@ Style/WhileUntilModifier:
   Exclude:
     - 'lib/liquid/tags/case.rb'
 
-# Offense count: 650
+# Offense count: 665
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https