Correctly indent if-then-else expressions.
Initial integration with server.