Indentation should happen top-to-bottom so that subsequent
indents are based on the updated code above

Issue #4248