diff --git a/src/dialect/mod.rs b/src/dialect/mod.rs
index c7041ad93..23c7f9baa 100644
--- a/src/dialect/mod.rs
+++ b/src/dialect/mod.rs
@@ -85,20 +85,11 @@ mod tests {
             dialect: ansi_dialect,
         };
 
-        assert_eq!(
-            dialect_of!(generic_holder is GenericDialect |  AnsiDialect),
-            true
-        );
-        assert_eq!(dialect_of!(generic_holder is  AnsiDialect), false);
+        assert!(dialect_of!(generic_holder is GenericDialect |  AnsiDialect),);
+        assert!(!dialect_of!(generic_holder is  AnsiDialect));
 
-        assert_eq!(dialect_of!(ansi_holder is  AnsiDialect), true);
-        assert_eq!(
-            dialect_of!(ansi_holder is  GenericDialect | AnsiDialect),
-            true
-        );
-        assert_eq!(
-            dialect_of!(ansi_holder is  GenericDialect | MsSqlDialect),
-            false
-        );
+        assert!(dialect_of!(ansi_holder is  AnsiDialect));
+        assert!(dialect_of!(ansi_holder is  GenericDialect | AnsiDialect),);
+        assert!(!dialect_of!(ansi_holder is  GenericDialect | MsSqlDialect),);
     }
 }
diff --git a/src/parser.rs b/src/parser.rs
index 75d603a79..66802ee25 100644
--- a/src/parser.rs
+++ b/src/parser.rs
@@ -2358,8 +2358,7 @@ impl<'a> Parser<'a> {
                         ]) // This couldn't possibly be a bad idea
                     })?
                     .into_iter()
-                    .filter(|i| i.is_some())
-                    .map(|i| i.unwrap())
+                    .flatten()
                     .collect();
 
                 lateral_views.push(LateralView {
diff --git a/tests/sqlparser_common.rs b/tests/sqlparser_common.rs
index bbb9bdc26..772853b28 100644
--- a/tests/sqlparser_common.rs
+++ b/tests/sqlparser_common.rs
@@ -249,7 +249,7 @@ fn parse_top_level() {
 fn parse_simple_select() {
     let sql = "SELECT id, fname, lname FROM customer WHERE id = 1 LIMIT 5";
     let select = verified_only_select(sql);
-    assert_eq!(false, select.distinct);
+    assert!(!select.distinct);
     assert_eq!(3, select.projection.len());
     let select = verified_query(sql);
     assert_eq!(Some(Expr::Value(number("5"))), select.limit);
@@ -269,7 +269,7 @@ fn parse_limit_is_not_an_alias() {
 fn parse_select_distinct() {
     let sql = "SELECT DISTINCT name FROM customer";
     let select = verified_only_select(sql);
-    assert_eq!(true, select.distinct);
+    assert!(select.distinct);
     assert_eq!(
         &SelectItem::UnnamedExpr(Expr::Identifier(Ident::new("name"))),
         only(&select.projection)
@@ -1693,8 +1693,8 @@ fn parse_alter_table_drop_column() {
             } => {
                 assert_eq!("tab", name.to_string());
                 assert_eq!("is_active", column_name.to_string());
-                assert_eq!(true, if_exists);
-                assert_eq!(true, cascade);
+                assert!(if_exists);
+                assert!(cascade);
             }
             _ => unreachable!(),
         }
@@ -2928,13 +2928,13 @@ fn parse_drop_table() {
             cascade,
             purge: _,
         } => {
-            assert_eq!(false, if_exists);
+            assert!(!if_exists);
             assert_eq!(ObjectType::Table, object_type);
             assert_eq!(
                 vec!["foo"],
                 names.iter().map(ToString::to_string).collect::<Vec<_>>()
             );
-            assert_eq!(false, cascade);
+            assert!(!cascade);
         }
         _ => unreachable!(),
     }
@@ -2948,13 +2948,13 @@ fn parse_drop_table() {
             cascade,
             purge: _,
         } => {
-            assert_eq!(true, if_exists);
+            assert!(if_exists);
             assert_eq!(ObjectType::Table, object_type);
             assert_eq!(
                 vec!["foo", "bar"],
                 names.iter().map(ToString::to_string).collect::<Vec<_>>()
             );
-            assert_eq!(true, cascade);
+            assert!(cascade);
         }
         _ => unreachable!(),
     }
@@ -3389,8 +3389,8 @@ fn parse_create_index() {
             assert_eq!("idx_name", name.to_string());
             assert_eq!("test", table_name.to_string());
             assert_eq!(indexed_columns, columns);
-            assert_eq!(true, unique);
-            assert_eq!(true, if_not_exists)
+            assert!(unique);
+            assert!(if_not_exists)
         }
         _ => unreachable!(),
     }