Fixed handling of do blocks and inline if/then/else.

Do blocks with content immediately after the do-keyword didn't indent properly,
due to a missing "very magic" flag in regular expression.

Also fixed a variable whose rename was misted and handling of inline
if/then/else expressions.