Preserve nested if branches

[cknitt]

Can we / do we want to preserve nested if branches, e.g.:

if a {
  b
} else {
  // test
  if c {
    d
  }
}

which would currently be formatted to

if a {
  b
} // test
else if c {
  d
}

(see the discussion in #564).