I agree on both examples. But the solution is to indent the extra lines of function calls by two levels instead of just one, which actually is the case here.