Handle re-indentation of lambdas better