The loop and while formatting was diverting as `loop` was not being moved to a new, indented block, as `while` was. This commit fixes this inconsistency but pins it to version 2 to avoid changing existing code.
