diff --git a/src/Language/Go/Assignment.hs b/src/Language/Go/Assignment.hs
index 084d77c0d..924a89aeb 100644
--- a/src/Language/Go/Assignment.hs
+++ b/src/Language/Go/Assignment.hs
@@ -34,8 +34,21 @@ type Syntax =
    , Declaration.Type
    , Declaration.TypeAlias
    , Expression.Arithmetic
-   , Expression.Bitwise
-   , Expression.Boolean
+   , Expression.BOr
+   , Expression.BAnd
+   , Expression.BXOr
+   , Expression.LShift
+   , Expression.RShift
+   , Expression.UnsignedRShift
+   , Expression.Complement
+   , Expression.BooleanOperator
+   , Expression.Call
+   , Expression.Comparison
+   , Expression.Subscript
+   , Statement.PostDecrement
+   , Statement.PostIncrement
+   , Expression.MemberAccess
+   , Expression.BooleanOperator
    , Expression.Call
    , Expression.Comparison
    , Expression.Subscript
diff --git a/src/Language/Java/Assignment.hs b/src/Language/Java/Assignment.hs
index 203afc1c5..5c0259178 100644
--- a/src/Language/Java/Assignment.hs
+++ b/src/Language/Java/Assignment.hs
@@ -37,8 +37,14 @@ type Syntax =
    , Expression.Arithmetic
    , Expression.Call
    , Expression.Comparison
-   , Expression.Bitwise
-   , Expression.Boolean
+   , Expression.BOr
+   , Expression.BXOr
+   , Expression.BAnd
+   , Expression.LShift
+   , Expression.RShift
+   , Expression.UnsignedRShift
+   , Expression.Complement
+   , Expression.BooleanOperator
    , Expression.InstanceOf
    , Expression.MemberAccess
    , Expression.Subscript
diff --git a/src/Language/PHP/Assignment.hs b/src/Language/PHP/Assignment.hs
index 85aebd336..6220c217d 100644
--- a/src/Language/PHP/Assignment.hs
+++ b/src/Language/PHP/Assignment.hs
@@ -42,8 +42,12 @@ type Syntax = '[
   , Declaration.Method
   , Declaration.VariableDeclaration
   , Expression.Arithmetic
-  , Expression.Bitwise
-  , Expression.Boolean
+  , Expression.BAnd
+  , Expression.BOr
+  , Expression.BXOr
+  , Expression.LShift
+  , Expression.RShift
+  , Expression.BooleanOperator
   , Expression.Call
   , Expression.Cast
   , Expression.Comparison
diff --git a/src/Language/Python/Assignment.hs b/src/Language/Python/Assignment.hs
index 4c032e059..1c70083dc 100644
--- a/src/Language/Python/Assignment.hs
+++ b/src/Language/Python/Assignment.hs
@@ -49,8 +49,13 @@ type Syntax =
    , Declaration.Function
    , Declaration.Variable
    , Expression.Arithmetic
-   , Expression.Boolean
-   , Expression.Bitwise
+   , Expression.BooleanOperator
+   , Expression.BAnd
+   , Expression.BOr
+   , Expression.BXOr
+   , Expression.LShift
+   , Expression.RShift
+   , Expression.Complement
    , Expression.Call
    , Expression.Comparison
    , Expression.Enumeration
diff --git a/src/Language/Ruby/Assignment.hs b/src/Language/Ruby/Assignment.hs
index 62ee8b8da..b0ebec210 100644
--- a/src/Language/Ruby/Assignment.hs
+++ b/src/Language/Ruby/Assignment.hs
@@ -40,21 +40,26 @@ import Prologue hiding (for)
 type Syntax = '[
     Comment.Comment
   , Declaration.Function
+  , Literal.Boolean
   , Declaration.Method
   , Directive.File
   , Directive.Line
   , Expression.Arithmetic
-  , Expression.Bitwise
-  , Expression.Boolean
+  , Expression.BAnd
+  , Expression.BOr
+  , Expression.BXOr
+  , Expression.LShift
+  , Expression.RShift
+  , Expression.Complement
+  , Expression.BooleanOperator
   , Expression.Call
   , Expression.Comparison
   , Expression.Enumeration
-  , Expression.Match
+  , Expression.RegexMatch
   , Expression.MemberAccess
   , Expression.ScopeResolution
   , Expression.Subscript
   , Literal.Array
-  , Literal.Boolean
   , Literal.Complex
   , Literal.Float
   , Literal.Hash
diff --git a/src/Language/TypeScript/Assignment.hs b/src/Language/TypeScript/Assignment.hs
index 7074b3202..234f8ce6b 100644
--- a/src/Language/TypeScript/Assignment.hs
+++ b/src/Language/TypeScript/Assignment.hs
@@ -48,8 +48,14 @@ type Syntax = '[
   , Declaration.VariableDeclaration
   , Declaration.TypeAlias
   , Expression.Arithmetic
-  , Expression.Bitwise
-  , Expression.Boolean
+  , Expression.BAnd
+  , Expression.BOr
+  , Expression.BXOr
+  , Expression.LShift
+  , Expression.RShift
+  , Expression.UnsignedRShift
+  , Expression.Complement
+  , Expression.BooleanOperator
   , Expression.Call
   , Expression.Cast
   , Expression.Comparison