Cosmetics: merge "} else" and "if (...) {" lines, less confusing.