diff --git a/rc/core/c-family.kak b/rc/core/c-family.kak
index ea4351ec0..5e1c006f9 100644
--- a/rc/core/c-family.kak
+++ b/rc/core/c-family.kak
@@ -28,26 +28,27 @@ def -hidden c-family-trim-autoindent %[ eval -draft -itersel %[
     try %[ exec <a-x> 1s^(\h+)$<ret> d ]
 ] ]
 
-def -hidden c-family-indent-on-newline %[ eval -draft -itersel %[
+def -hidden c-family-indent-on-newline %< eval -draft -itersel %<
     exec \;
-    try %[
+    try %<
         # if previous line closed a paren, copy indent of the opening paren line
         exec -draft k<a-x> 1s(\))(\h+\w+)*\h*(\;\h*)?$<ret> m<a-\;>J s\`|.\'<ret> 1<a-&>
-    ] catch %[
+    > catch %<
         # else indent new lines with the same level as the previous one
         exec -draft K <a-&>
-    ]
+    >
     # remove previous empty lines resulting from the automatic indent
-    try %[ exec -draft k <a-x> <a-k>^\h+$<ret> Hd ]
+    try %< exec -draft k <a-x> <a-k>^\h+$<ret> Hd >
     # indent after an opening brace
-    try %[ exec -draft k <a-x> s\{\h*$<ret> j <a-gt> ]
+    try %< exec -draft k <a-x> s\{\h*$<ret> j <a-gt> >
     # indent after a label
-    try %[ exec -draft k <a-x> s[a-zA-Z0-9_-]+:\h*$<ret> j <a-gt> ]
+    try %< exec -draft k <a-x> s[a-zA-Z0-9_-]+:\h*$<ret> j <a-gt> >
     # indent after a statement not followed by an opening brace
-    try %[ exec -draft k <a-x> <a-k>\b(if|else|for|while)\h*\(.+?\)\h*$<ret> j <a-gt> ]
-    # align to the opening parenthesis on a previous line if its followed by text on the same line
-    try %[ exec -draft {b <a-k>\`\([^\n]+\n[^\n]*\n?\'<ret> L s\`|.\'<ret> & ]
-] ]
+    try %< exec -draft k <a-x> <a-k>\b(if|else|for|while)\h*\(.+?\)\h*$<ret> j <a-gt> >
+    # align to the opening parenthesis or opening bracket (whichever is first)
+    # on a previous line if its followed by text on the same line
+    try %< exec -draft [b Z<a-\;>[B<a-z><gt> <a-k>\`[{(][^\n]+\n[^\n]*\n?\'<ret> L s\`|.\'<ret> & >
+> >
 
 def -hidden c-family-indent-on-opening-curly-brace %[
     # align indent with opening paren when { is entered on a new line after the closing paren
diff --git a/test/indent/c-family/construct-align/cmd b/test/indent/c-family/construct-align/cmd
new file mode 100644
index 000000000..760030305
--- /dev/null
+++ b/test/indent/c-family/construct-align/cmd
@@ -0,0 +1 @@
+c<ret><esc>
diff --git a/test/indent/c-family/construct-align/in b/test/indent/c-family/construct-align/in
new file mode 100644
index 000000000..ed49c6539
--- /dev/null
+++ b/test/indent/c-family/construct-align/in
@@ -0,0 +1 @@
+MyObject obj{param1,%( )param2};
diff --git a/test/indent/c-family/construct-align/out b/test/indent/c-family/construct-align/out
new file mode 100644
index 000000000..bdf7fad5c
--- /dev/null
+++ b/test/indent/c-family/construct-align/out
@@ -0,0 +1,2 @@
+MyObject obj{param1,
+             param2};
diff --git a/test/indent/c-family/construct-align/rc b/test/indent/c-family/construct-align/rc
new file mode 100644
index 000000000..53c40654e
--- /dev/null
+++ b/test/indent/c-family/construct-align/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/core/c-family.kak"
+set buffer filetype cpp
diff --git a/test/indent/c-family/nested-align/cmd b/test/indent/c-family/nested-align/cmd
new file mode 100644
index 000000000..6e0346582
--- /dev/null
+++ b/test/indent/c-family/nested-align/cmd
@@ -0,0 +1 @@
+c<ret>qux<esc>
diff --git a/test/indent/c-family/nested-align/in b/test/indent/c-family/nested-align/in
new file mode 100644
index 000000000..e368eef6e
--- /dev/null
+++ b/test/indent/c-family/nested-align/in
@@ -0,0 +1,3 @@
+foo{bar(baz,%( )
+
+foo(bar{baz,%( )
diff --git a/test/indent/c-family/nested-align/out b/test/indent/c-family/nested-align/out
new file mode 100644
index 000000000..d53cc96d4
--- /dev/null
+++ b/test/indent/c-family/nested-align/out
@@ -0,0 +1,5 @@
+foo{bar(baz,
+        qux
+
+foo(bar{baz,
+        qux
diff --git a/test/indent/c-family/nested-align/rc b/test/indent/c-family/nested-align/rc
new file mode 100644
index 000000000..53c40654e
--- /dev/null
+++ b/test/indent/c-family/nested-align/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/core/c-family.kak"
+set buffer filetype cpp