 	(cond ((bobp)	;must be first statement in block or exp
 	       (if (nth 1 state)	;within a paren exp
 		   (setq indent-amount (+ (slate-current-column)
-					  slate-indent-amount))
+					  slate-indent-increment))
 		 ;; we're top level
-		 (setq indent-amount slate-indent-amount)))
+		 (setq indent-amount slate-indent-increment)))
 	      ((equal (nth 0 state) 0) ;at top-level
 	       (beginning-of-line)
 	       (slate-forward-whitespace)

	(cond ((equal (nth 3 state) ?\") ;in a comment
	       (save-excursion
		 (slate-backward-comment)
		 (setq indent-amount (+ (current-column) slate-indent-amount))))
	      ((equal (nth 3 state) ?')	;in a string
	       (setq indent-amount 0))
	      ((equal (nth 3 state) ?\))
	       (setq indent-amount (+ (current-column) slate-indent-amount))))
	(when indent-amount
	  (return-from slate-calculate-indent indent-amount))
	(slate-narrow-to-method)

	 ((or (eq (setq c (preceding-char)) ?\|)
	      (eq c ?\[))		; method header before
	  (skip-chars-backward "^\[")
	  (setq indent-amount slate-indent-increment))
	 ((eq c ?.)	; stmt end, indent like it
	  (slate-find-statement-begin)
	  (setq indent-amount (slate-current-column)))
