Handle multi-way ifs with proper layout

This fixes broken indentation of expressions within multi-way if.
Also, added support for multi-way ifs with explicit layout.