Index: src/AST/Convert.cpp
===================================================================
--- src/AST/Convert.cpp	(revision eb779d5ca94c2de1db899969438189f4b2c05b4b)
+++ src/AST/Convert.cpp	(revision 61e5d998091dfd12ea60e1fee02afb30670df0f3)
@@ -269,5 +269,5 @@
 			node->location,
 			Type::StorageClasses( node->storage.val ),
-            get<Type>().accept1( node->base ),
+			get<Type>().accept1( node->base ),
 			LinkageSpec::Spec( node->linkage.val )
 		);
@@ -567,5 +567,5 @@
 	}
 
-    const ast::WhenClause * visit( const ast::WhenClause * node ) override final {
+	const ast::WhenClause * visit( const ast::WhenClause * node ) override final {
 		// There is no old-AST WhenClause, so this should never be called.
 		assert( !node );
@@ -604,6 +604,6 @@
 	}
 
-    const ast::Stmt * visit( const ast::WaitUntilStmt * node ) override final {
-        // There is no old-AST WaitUntilStmt, so this should never be called.
+	const ast::Stmt * visit( const ast::WaitUntilStmt * node ) override final {
+		// There is no old-AST WaitUntilStmt, so this should never be called.
 		assert( !node );
 		return nullptr;
@@ -650,6 +650,6 @@
 	}
 
-    const ast::Stmt * visit( const ast::CorunStmt * node ) override final {
-        // There is no old-AST CorunStmt, so this should never be called.
+	const ast::Stmt * visit( const ast::CorunStmt * node ) override final {
+		// There is no old-AST CorunStmt, so this should never be called.
 		assert( !node );
 		return nullptr;
@@ -859,5 +859,5 @@
 		// New workd:   one public type: node->result, plus node->underlyer only to support roundtrip conversion
 		//              preserving underlyer because the correct type for string literals is complicated to construct,
-	    //              and distinguishing a string from other literals using the type is hard to do accurately
+		//              and distinguishing a string from other literals using the type is hard to do accurately
 		// Both worlds: the outer, expression-level type can change during resolution
 		//              for a string, that's char[k] before-resolve and char * after
@@ -865,5 +865,5 @@
 		//              for a string, that's char[k] always
 		// Both worlds: the "rep" field of a constant is the C source file fragment that compiles to the desired value
-        //              for a string, that includes outer quotes, backslashes, et al cases from the Literals test
+		//              for a string, that includes outer quotes, backslashes, et al cases from the Literals test
 		ConstantExpr *rslt = new ConstantExpr(Constant(
 			get<Type>().accept1(node->underlyer),
@@ -1524,5 +1524,5 @@
 		return strict_dynamic_cast< ast::Decl * >( node );
 	}
-	
+
 	ConverterOldToNew() = default;
 	ConverterOldToNew(const ConverterOldToNew &) = delete;
@@ -1587,5 +1587,5 @@
 	ast::Label make_label(const Label* old) {
 		CodeLocation const & location =
-		    ( old->labelled ) ? old->labelled->location : CodeLocation();
+			( old->labelled ) ? old->labelled->location : CodeLocation();
 		return ast::Label(
 			location,
@@ -2246,5 +2246,4 @@
 	// TypeSubstitution shouldn't exist yet in old.
 	ast::TypeSubstitution * convertTypeSubstitution(const TypeSubstitution * old) {
-		
 		if (!old) return nullptr;
 		if (old->empty()) return nullptr;
@@ -2291,5 +2290,5 @@
 	ast::Expr * visitBaseExpr_SkipResultType( const Expression * old, ast::Expr * nw) {
 
-		nw->env    = convertTypeSubstitution(old->env);
+		nw->env = convertTypeSubstitution(old->env);
 
 		nw->extension = old->extension;
@@ -2862,5 +2861,5 @@
 
 	virtual void visit( const EnumInstType * old ) override final {
-		ast::EnumInstType * ty; 
+		ast::EnumInstType * ty;
 		if ( old->baseEnum ) {
 			ty = new ast::EnumInstType{
Index: src/AST/Pass.hpp
===================================================================
--- src/AST/Pass.hpp	(revision eb779d5ca94c2de1db899969438189f4b2c05b4b)
+++ src/AST/Pass.hpp	(revision 61e5d998091dfd12ea60e1fee02afb30670df0f3)
@@ -162,8 +162,8 @@
 	const ast::FinallyClause *    visit( const ast::FinallyClause        * ) override final;
 	const ast::Stmt *             visit( const ast::SuspendStmt          * ) override final;
-    const ast::WhenClause *       visit( const ast::WhenClause           * ) override final;
+	const ast::WhenClause *       visit( const ast::WhenClause           * ) override final;
 	const ast::Stmt *             visit( const ast::WaitForStmt          * ) override final;
 	const ast::WaitForClause *    visit( const ast::WaitForClause        * ) override final;
-    const ast::Stmt *             visit( const ast::WaitUntilStmt        * ) override final;
+	const ast::Stmt *             visit( const ast::WaitUntilStmt        * ) override final;
 	const ast::Decl *             visit( const ast::WithStmt             * ) override final;
 	const ast::NullStmt *         visit( const ast::NullStmt             * ) override final;
@@ -171,5 +171,5 @@
 	const ast::Stmt *             visit( const ast::ImplicitCtorDtorStmt * ) override final;
 	const ast::Stmt *             visit( const ast::MutexStmt            * ) override final;
-    const ast::Stmt *             visit( const ast::CorunStmt            * ) override final;
+	const ast::Stmt *             visit( const ast::CorunStmt            * ) override final;
 	const ast::Expr *             visit( const ast::ApplicationExpr      * ) override final;
 	const ast::Expr *             visit( const ast::UntypedExpr          * ) override final;
Index: src/AST/Print.cpp
===================================================================
--- src/AST/Print.cpp	(revision eb779d5ca94c2de1db899969438189f4b2c05b4b)
+++ src/AST/Print.cpp	(revision 61e5d998091dfd12ea60e1fee02afb30670df0f3)
@@ -209,5 +209,5 @@
 	}
 
-    void print( const ast::WaitStmt * node ) {
+	void print( const ast::WaitStmt * node ) {
 		if ( node->timeout_time ) {
 			os << indent-1 << "timeout of:" << endl;
@@ -860,5 +860,5 @@
 	}
 
-    virtual const ast::Stmt * visit( const ast::WaitUntilStmt * node ) override final {
+	virtual const ast::Stmt * visit( const ast::WaitUntilStmt * node ) override final {
 		os << "Waituntil Statement" << endl;
 		indent += 2;
@@ -866,5 +866,6 @@
 			clause->accept( *this );
 		}
-        print(node);    // calls print( const ast::WaitStmt * node )
+		// calls print( const ast::WaitStmt * node )
+		print(node);
 		return node;
 	}
@@ -922,5 +923,5 @@
 	}
 
-    virtual const ast::Stmt * visit( const ast::CorunStmt * node ) override final {
+	virtual const ast::Stmt * visit( const ast::CorunStmt * node ) override final {
 		os << "Corun Statement" << endl;
 		os << indent << "... with Statement: ";