Better indenting of empty conditionals. Still not perfect, though.