Fix problems introduced by new rule for indenting empty lines