        ;; "else", align to the starting column plus one indent level.
        (save-excursion
          (and (futhark-backward-part)
-              (or (looking-at "\\<then$")
-                  (looking-at "\\<else$"))
+              (or (looking-at "\\<then[[:space:]]*$")
+                  (looking-at "\\<else[[:space:]]*$"))
               (progn (futhark-beginning-of-line-text) t)
               (+ (current-column) futhark-indent-level)))
 

       ;; first on the line) plus one indent level.
       (save-excursion
         (and (futhark-backward-part)
              (looking-at "\\<do$")
              (or (and (futhark-find-closest-of-keywords-backward '("for" "while"))
                       (futhark-is-beginning-of-line-text)
                       (+ (current-column) futhark-indent-level))

       ;; the matching "let" or "loop" column.
       (save-excursion
         (and (futhark-backward-part)
              (looking-at "\\<in[[:space:]]*$")
              (futhark-find-closest-of-keywords-backward '("let" "loop"))
              (current-column)))

