Editorial: unify various forms of if-otherwise in single-line conditionals

Editorial: unify various forms of if-otherwise in single-line conditionals #5241