diff --git a/cpp/ql/src/semmle/code/cpp/Type.qll b/cpp/ql/src/semmle/code/cpp/Type.qll
index 2226f0718d1..38e3bc13f57 100644
--- a/cpp/ql/src/semmle/code/cpp/Type.qll
+++ b/cpp/ql/src/semmle/code/cpp/Type.qll
@@ -1184,7 +1184,7 @@ class ArrayType extends DerivedType {
  * allows vector types to be introduced using the `ext_vector_type`,
  * `neon_vector_type`, and `neon_polyvector_type` attributes (all of which take
  * an element count rather than a byte size).
- * 
+ *
  * In the example below, both `v4si` and `float4` are GNU vector types:
  * ```
  * typedef int v4si __attribute__ (( vector_size(4*sizeof(int)) ));
diff --git a/cpp/ql/src/semmle/code/cpp/exprs/ArithmeticOperation.qll b/cpp/ql/src/semmle/code/cpp/exprs/ArithmeticOperation.qll
index 310c7147d37..8eae1aa8d82 100644
--- a/cpp/ql/src/semmle/code/cpp/exprs/ArithmeticOperation.qll
+++ b/cpp/ql/src/semmle/code/cpp/exprs/ArithmeticOperation.qll
@@ -41,7 +41,7 @@ class UnaryPlusExpr extends UnaryArithmeticOperation, @unaryplusexpr {
  * functions.
  * ```
  * _Complex double a =  ( 1.0, 2.0 );
- * _Complex double b = ~ a;  // ( 1,0, - 2.0 )
+ * _Complex double b = ~ a;  // ( 1.0, - 2.0 )
  * ```
  */
 class ConjugationExpr extends UnaryArithmeticOperation, @conjugation {
@@ -55,7 +55,7 @@ class ConjugationExpr extends UnaryArithmeticOperation, @conjugation {
  *
  * This is the abstract base QL class for increment and decrement operations.
  *
- * Note that this does not include calls to _user-defined_ `operator++`
+ * Note that this does not include calls to user-defined `operator++`
  * or `operator--`.
  */
 abstract class CrementOperation extends UnaryArithmeticOperation {
@@ -74,35 +74,35 @@ abstract class CrementOperation extends UnaryArithmeticOperation {
 /**
  * A C/C++ `++` expression (either prefix or postfix).
  *
- * Note that this does not include calls to _user-defined_ `operator++`.
+ * Note that this does not include calls to user-defined `operator++`.
  */
 abstract class IncrementOperation extends CrementOperation { }
 
 /**
  * A C/C++ `--` expression (either prefix or postfix).
  *
- * Note that this does not include calls to _user-defined_ `operator--`.
+ * Note that this does not include calls to user-defined `operator--`.
  */
 abstract class DecrementOperation extends CrementOperation { }
 
 /**
  * A C/C++ `++` or `--` prefix expression.
  *
- * Note that this does not include calls to _user-defined_ operators.
+ * Note that this does not include calls to user-defined operators.
  */
 abstract class PrefixCrementOperation extends CrementOperation { }
 
 /**
  * A C/C++ `++` or `--` postfix expression.
  *
- * Note that this does not include calls to _user-defined_ operators.
+ * Note that this does not include calls to user-defined operators.
  */
 abstract class PostfixCrementOperation extends CrementOperation { }
 
 /**
  * A C/C++ prefix increment expression, as in `++x`.
  *
- * Note that this does not include calls to _user-defined_ `operator++`.
+ * Note that this does not include calls to user-defined `operator++`.
  * ```
  * b = ++a;
  * ```
@@ -118,7 +118,7 @@ class PrefixIncrExpr extends IncrementOperation, PrefixCrementOperation, @preinc
 /**
  * A C/C++ prefix decrement expression, as in `--x`.
  *
- * Note that this does not include calls to _user-defined_ `operator--`.
+ * Note that this does not include calls to user-defined `operator--`.
  * ```
  * b = --a;
  * ```
@@ -134,7 +134,7 @@ class PrefixDecrExpr extends DecrementOperation, PrefixCrementOperation, @predec
 /**
  * A C/C++ postfix increment expression, as in `x++`.
  *
- * Note that this does not include calls to _user-defined_ `operator++`.
+ * Note that this does not include calls to user-defined `operator++`.
  * ```
  * b = a++;
  * ```
@@ -152,7 +152,7 @@ class PostfixIncrExpr extends IncrementOperation, PostfixCrementOperation, @post
 /**
  * A C/C++ postfix decrement expression, as in `x--`.
  *
- * Note that this does not include calls to _user-defined_ `operator--`.
+ * Note that this does not include calls to user-defined `operator--`.
  * ```
  * b = a--;
  * ```
diff --git a/cpp/ql/src/semmle/code/cpp/exprs/Call.qll b/cpp/ql/src/semmle/code/cpp/exprs/Call.qll
index 62db9e29949..ec7244c88bc 100644
--- a/cpp/ql/src/semmle/code/cpp/exprs/Call.qll
+++ b/cpp/ql/src/semmle/code/cpp/exprs/Call.qll
@@ -230,7 +230,7 @@ class FunctionCall extends Call, @funbindexpr {
    * Gets the function called by this call.
    *
    * In the case of virtual function calls, the result is the most-specific function in the override tree (as
-   * determined by the compiler) such that the target at runtime will be one of **result.getAnOverridingFunction\*()**.
+   * determined by the compiler) such that the target at runtime will be one of `result.getAnOverridingFunction*()`.
    */
   override Function getTarget() { funbind(underlyingElement(this), unresolveElement(result)) }
 
diff --git a/cpp/ql/src/semmle/code/cpp/exprs/Expr.qll b/cpp/ql/src/semmle/code/cpp/exprs/Expr.qll
index f696a0e6bdf..941046c8f73 100644
--- a/cpp/ql/src/semmle/code/cpp/exprs/Expr.qll
+++ b/cpp/ql/src/semmle/code/cpp/exprs/Expr.qll
@@ -5,7 +5,7 @@ private import semmle.code.cpp.internal.AddressConstantExpression
 
 /**
  * A C/C++ expression.
- * 
+ *
  * This is the root QL class for all expressions.
  */
 class Expr extends StmtParent, @expr {
@@ -518,7 +518,7 @@ abstract class BinaryOperation extends Operation {
  *   T member;
  *   S() { member = T({ arg1, arg2 }); }
  * };
- * ```  
+ * ```
  */
 class ParenthesizedBracedInitializerList extends Expr, @braced_init_list {
   override string toString() { result = "({...})" }
@@ -528,7 +528,7 @@ class ParenthesizedBracedInitializerList extends Expr, @braced_init_list {
 
 /**
  * A C/C++ parenthesis expression.
- * 
+ *
  * It is typically used to raise the syntactic precedence of the subexpression that
  * it contains.  For example:
  * ```
@@ -543,7 +543,7 @@ class ParenthesisExpr extends Conversion, @parexpr {
 
 /**
  * A C/C++ expression that has not been resolved.
- * 
+ *
  * It is assigned `ErroneousType` as its type.
  */
 class ErrorExpr extends Expr, @errorexpr {
@@ -554,7 +554,7 @@ class ErrorExpr extends Expr, @errorexpr {
 
 /**
  * A Microsoft C/C++ __assume expression.
- * 
+ *
  * Unlike `assert`, `__assume` is evaluated at compile-time and
  * is treated as a hint to the optimizer
  * ```