enable lints (#1822)

diff --git a/analysis_options.yaml b/analysis_options.yaml
index 80c85b2..64df30e 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -33,6 +33,7 @@
 #    - avoid_private_typedef_functions # under review (see #1068)
 #    - avoid_renaming_method_parameters # under review (see #1068)
     - avoid_returning_null
+    - avoid_returning_null_for_future
     - avoid_returning_this
     - avoid_setters_without_getters
 #    - avoid_single_cascade_in_expression_statements # under review (see #1068)
@@ -110,8 +111,8 @@
 #    - unnecessary_new (included in pedantic)
     - unnecessary_null_aware_assignments
     - unnecessary_overrides
-#    - unnecessary_parenthesis # under review (see #1068)
-#    - unnecessary_statements # under review (see #1068)
+    - unnecessary_parenthesis
+    - unnecessary_statements
     - unnecessary_this
     - use_setters_to_change_properties
     - use_string_buffers
diff --git a/lib/src/rules/avoid_unused_constructor_parameters.dart b/lib/src/rules/avoid_unused_constructor_parameters.dart
index 5b8cdb9..0061680 100644
--- a/lib/src/rules/avoid_unused_constructor_parameters.dart
+++ b/lib/src/rules/avoid_unused_constructor_parameters.dart
@@ -55,7 +55,7 @@
 
   _ConstructorVisitor(this.rule, this.element)
       : unusedParameters = element.parameters.parameters
-            .where((p) => (p.declaredElement is! FieldFormalParameterElement))
+            .where((p) => p.declaredElement is! FieldFormalParameterElement)
             .toSet();
 
   @override
diff --git a/lib/src/util/leak_detector_visitor.dart b/lib/src/util/leak_detector_visitor.dart
index 5147b49..4405946 100644
--- a/lib/src/util/leak_detector_visitor.dart
+++ b/lib/src/util/leak_detector_visitor.dart
@@ -149,12 +149,12 @@
 
 bool _isSimpleIdentifierElementEqualToVariable(
         AstNode n, VariableDeclaration variable) =>
-    (n is SimpleIdentifier &&
-        // Assignment to VariableDeclaration as variable.
-        (n.staticElement == variable.name.staticElement ||
-            (n.staticElement is PropertyAccessorElement &&
-                (n.staticElement as PropertyAccessorElement).variable ==
-                    variable.name.staticElement)));
+    n is SimpleIdentifier &&
+    // Assignment to VariableDeclaration as variable.
+    (n.staticElement == variable.name.staticElement ||
+        (n.staticElement is PropertyAccessorElement &&
+            (n.staticElement as PropertyAccessorElement).variable ==
+                variable.name.staticElement));
 
 typedef bool DartTypePredicate(DartType type);
 
diff --git a/test/mocks.dart b/test/mocks.dart
index 6f0cb69..6c548ea 100644
--- a/test/mocks.dart
+++ b/test/mocks.dart
@@ -59,7 +59,7 @@
   Encoding encoding;
 
   @override
-  Future get done => null;
+  Future get done => Future.value(null);
 
   @override
   void add(List<int> data) {}
@@ -68,13 +68,13 @@
   void addError(Object error, [StackTrace stackTrace]) {}
 
   @override
-  Future addStream(Stream<List<int>> stream) => null;
+  Future addStream(Stream<List<int>> stream) => Future.value(null);
 
   @override
-  Future close() => null;
+  Future close() => Future.value(null);
 
   @override
-  Future flush() => null;
+  Future flush() => Future.value(null);
 
   @override
   void write(Object obj) {}