issue #487: Rewrite: do not modify the indentation level in order to ease the code review.