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