From 17885b337f1669e48effa5ee4205c49d64b9199e Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Wed, 14 Jun 2017 15:33:37 +0100
Subject: [PATCH] Performance: remove the label statements or use underscore so
 grib_push_accessor does not add them to cache

---
 definitions/empty_template.def                         |  2 +-
 definitions/grib1/local.34.def                         |  1 -
 definitions/grib1/section.0.def                        |  2 +-
 definitions/grib2/local.85.0.def                       |  2 +-
 definitions/grib2/local.98.0.def                       |  2 +-
 definitions/grib2/local.98.1.def                       |  2 +-
 definitions/grib2/local.98.5.def                       |  2 +-
 .../grib2/localConcepts/edzw/default_step_units.def    |  1 -
 definitions/grib2/meta.def                             |  2 +-
 definitions/grib2/section.5.def                        |  1 -
 definitions/grib2/section.6.def                        |  2 +-
 definitions/grib2/section.7.def                        |  2 +-
 definitions/grib2/template.3.spherical_harmonics.def   |  1 -
 definitions/grib2/template.3.stretching.def            |  2 --
 definitions/grib2/template.4.2000.def                  |  2 +-
 definitions/grib2/template.4.categorical.def           |  2 --
 definitions/grib2/template.4.circular_cluster.def      |  2 --
 definitions/grib2/template.4.derived.def               |  2 --
 definitions/grib2/template.4.eps.def                   |  2 --
 definitions/grib2/template.4.parameter.def             |  2 --
 definitions/grib2/template.4.parameter_aerosol.def     |  2 --
 definitions/grib2/template.4.parameter_aerosol_44.def  |  3 ---
 .../grib2/template.4.parameter_aerosol_optical.def     |  2 --
 definitions/grib2/template.4.parameter_chemical.def    |  2 --
 .../template.4.parameter_chemical_distribution.def     |  2 --
 definitions/grib2/template.4.parameter_partition.def   |  2 --
 definitions/grib2/template.4.parameter_postproc.def    |  2 --
 definitions/grib2/template.4.parameter_tile.def        |  2 --
 definitions/grib2/template.4.percentile.def            |  2 --
 definitions/grib2/template.4.probability.def           |  2 --
 definitions/grib2/template.4.rectangular_cluster.def   |  2 --
 definitions/grib2/template.4.reforecast.def            |  2 --
 definitions/grib2/template.4.statistical.def           |  1 -
 definitions/grib2/template.5.4.def                     |  1 -
 definitions/grib2/template.5.6.def                     |  1 -
 definitions/grib2/template.5.61.def                    |  1 -
 definitions/mars/base.def                              |  2 +-
 definitions/mars/eswi/grib.oper.3v.def                 |  2 +-
 definitions/mars/eswi/grib.oper.4v.def                 |  2 +-
 definitions/mars/eswi/grib.oper.an.def                 |  2 +-
 definitions/mars/eswi/grib.oper.si.def                 |  2 +-
 definitions/mars/grib.edmm.fg.def                      |  1 -
 definitions/mars/grib.lwda.4v.def                      |  1 -
 definitions/mars/grib.lwda.an.def                      |  1 -
 definitions/mars/grib.lwda.ea.def                      |  1 -
 definitions/mars/grib.lwda.ef.def                      |  1 -
 definitions/mars/grib.lwda.me.def                      |  1 -
 definitions/mars/grib.me.def                           |  2 +-
 definitions/mars/grib.mnth.fg.def                      |  2 +-
 examples/python/high_level_api.py                      | 10 ++++------
 50 files changed, 21 insertions(+), 74 deletions(-)

diff --git a/definitions/empty_template.def b/definitions/empty_template.def
index cc16a58ce..f5da9a369 100644
--- a/definitions/empty_template.def
+++ b/definitions/empty_template.def
@@ -1,2 +1,2 @@
-label "x";
+label "_x";
 
diff --git a/definitions/grib1/local.34.def b/definitions/grib1/local.34.def
index 4370a165b..5498d0932 100644
--- a/definitions/grib1/local.34.def
+++ b/definitions/grib1/local.34.def
@@ -1,4 +1,3 @@
-label "JMA - extension";
 # Japanese Meteorological Agency
 codetable[1] localDefinitionNumber 'grib1/localDefinitionNumber.34.table' = 1 : dump;
 template  localDefinition  "grib1/local.34.[localDefinitionNumber:l].def";
diff --git a/definitions/grib1/section.0.def b/definitions/grib1/section.0.def
index cc545f4d7..ebe8283cd 100644
--- a/definitions/grib1/section.0.def
+++ b/definitions/grib1/section.0.def
@@ -7,4 +7,4 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label empty;
+label "_empty";
diff --git a/definitions/grib2/local.85.0.def b/definitions/grib2/local.85.0.def
index 193a2b1b2..8b8d747c7 100644
--- a/definitions/grib2/local.85.0.def
+++ b/definitions/grib2/local.85.0.def
@@ -1 +1 @@
-label "empty section";
+label "_empty section";
diff --git a/definitions/grib2/local.98.0.def b/definitions/grib2/local.98.0.def
index e67dcb3f7..919a1dfc3 100644
--- a/definitions/grib2/local.98.0.def
+++ b/definitions/grib2/local.98.0.def
@@ -1,3 +1,3 @@
-label "empty section";
+label "_empty section";
 
 
diff --git a/definitions/grib2/local.98.1.def b/definitions/grib2/local.98.1.def
index 4e4d2f9b9..b8b49723e 100644
--- a/definitions/grib2/local.98.1.def
+++ b/definitions/grib2/local.98.1.def
@@ -1,3 +1,3 @@
-label "local 98.1";
+label "_local 98.1";
 
 
diff --git a/definitions/grib2/local.98.5.def b/definitions/grib2/local.98.5.def
index 78c9556dc..875d282a5 100644
--- a/definitions/grib2/local.98.5.def
+++ b/definitions/grib2/local.98.5.def
@@ -7,6 +7,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "empty section";
+label "_empty section";
 
 # END   1/local.98.5 ----------------------------------------------------------------------
diff --git a/definitions/grib2/localConcepts/edzw/default_step_units.def b/definitions/grib2/localConcepts/edzw/default_step_units.def
index 140337680..2fc863c11 100644
--- a/definitions/grib2/localConcepts/edzw/default_step_units.def
+++ b/definitions/grib2/localConcepts/edzw/default_step_units.def
@@ -1,4 +1,3 @@
 # Override for sub-hourly steps
 # See ECC-438
-label "subhourly";
 alias defaultStepUnits=indicatorOfUnitOfTimeRange;
diff --git a/definitions/grib2/meta.def b/definitions/grib2/meta.def
index 672693a25..cf81f4e97 100644
--- a/definitions/grib2/meta.def
+++ b/definitions/grib2/meta.def
@@ -7,6 +7,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "Empty file";
+label "_Empty file";
 
 #meta    area    g1area(latitudeOfFirstGridPoint,longitudeOfFirstGridPoint,latitudeOfLastGridPoint,longitudeOfLastGridPoint,angleMultiplier,angleDivisor);
diff --git a/definitions/grib2/section.5.def b/definitions/grib2/section.5.def
index 2402c9664..f5bbff9aa 100644
--- a/definitions/grib2/section.5.def
+++ b/definitions/grib2/section.5.def
@@ -7,7 +7,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "grib 2 Section 5 DATA REPRESENTATION SECTION";
 position offsetBSection5;
 
 # START grib2::section
diff --git a/definitions/grib2/section.6.def b/definitions/grib2/section.6.def
index 3d7ba7796..ac24601da 100644
--- a/definitions/grib2/section.6.def
+++ b/definitions/grib2/section.6.def
@@ -7,7 +7,7 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "grib 2 Section 6 BIT-MAP SECTION";
+
 # START grib2::section
 # SECTION 6, BIT-MAP SECTION
 #  Length of section in octets
diff --git a/definitions/grib2/section.7.def b/definitions/grib2/section.7.def
index 8f9307d16..f8013ae00 100644
--- a/definitions/grib2/section.7.def
+++ b/definitions/grib2/section.7.def
@@ -7,7 +7,7 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "grib 2 Section 7 data";
+
 # START grib2::section
 # SECTION 7, DATA SECTION
 #  Length of section in octets
diff --git a/definitions/grib2/template.3.spherical_harmonics.def b/definitions/grib2/template.3.spherical_harmonics.def
index 74a54cd7b..56b9c2b3c 100755
--- a/definitions/grib2/template.3.spherical_harmonics.def
+++ b/definitions/grib2/template.3.spherical_harmonics.def
@@ -7,7 +7,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "Spherical harmonics";
 constant sphericalHarmonics=1;
 
 # constant dataRepresentationType  = 50;
diff --git a/definitions/grib2/template.3.stretching.def b/definitions/grib2/template.3.stretching.def
index 9a6d202b9..37f2c005f 100755
--- a/definitions/grib2/template.3.stretching.def
+++ b/definitions/grib2/template.3.stretching.def
@@ -7,8 +7,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "Stretching information";
-
 #  Latitude of the pole of stretching
 signed[4] latitudeOfThePoleOfStretching  : edition_specific,no_copy;
 
diff --git a/definitions/grib2/template.4.2000.def b/definitions/grib2/template.4.2000.def
index 3b7b2fcdd..f4a76c3f4 100644
--- a/definitions/grib2/template.4.2000.def
+++ b/definitions/grib2/template.4.2000.def
@@ -8,7 +8,7 @@
 #
 
 # test template
-label "test template";
+label "_test template";
 
 
 
diff --git a/definitions/grib2/template.4.categorical.def b/definitions/grib2/template.4.categorical.def
index 1f8dbcddd..549b4e241 100755
--- a/definitions/grib2/template.4.categorical.def
+++ b/definitions/grib2/template.4.categorical.def
@@ -7,8 +7,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "Categorical Forecast";
-
 #  Total number of forecast probabilities
 unsigned[1] numberOfCategories  : dump;
 
diff --git a/definitions/grib2/template.4.circular_cluster.def b/definitions/grib2/template.4.circular_cluster.def
index 0a32ff477..9ec2095b7 100755
--- a/definitions/grib2/template.4.circular_cluster.def
+++ b/definitions/grib2/template.4.circular_cluster.def
@@ -7,8 +7,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "Circular cluster";
-
 #  Cluster identifier
 unsigned[1] clusterIdentifier  : dump;
 alias number=clusterIdentifier;
diff --git a/definitions/grib2/template.4.derived.def b/definitions/grib2/template.4.derived.def
index 617c287f4..c0d2042f7 100755
--- a/definitions/grib2/template.4.derived.def
+++ b/definitions/grib2/template.4.derived.def
@@ -7,8 +7,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "Derived forecast";
-
 #  Derived forecast
 codetable[1] derivedForecast ('4.7.table',masterDir,localDir) : dump;
 
diff --git a/definitions/grib2/template.4.eps.def b/definitions/grib2/template.4.eps.def
index 06bc6d710..56b9f570b 100644
--- a/definitions/grib2/template.4.eps.def
+++ b/definitions/grib2/template.4.eps.def
@@ -7,8 +7,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "EPS information";
-
 #  Type of ensemble forecast
 codetable[1] typeOfEnsembleForecast ('4.6.table',masterDir,localDir) = 255 : dump;
 
diff --git a/definitions/grib2/template.4.parameter.def b/definitions/grib2/template.4.parameter.def
index aedfc8f1a..c24c1ed77 100644
--- a/definitions/grib2/template.4.parameter.def
+++ b/definitions/grib2/template.4.parameter.def
@@ -7,8 +7,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "Parameter information";
-
 #  Parameter category
 codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump;
 
diff --git a/definitions/grib2/template.4.parameter_aerosol.def b/definitions/grib2/template.4.parameter_aerosol.def
index 216de618a..a09e6fdd3 100644
--- a/definitions/grib2/template.4.parameter_aerosol.def
+++ b/definitions/grib2/template.4.parameter_aerosol.def
@@ -7,8 +7,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "Parameter information";
-
 #  Parameter category
 codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump;
 
diff --git a/definitions/grib2/template.4.parameter_aerosol_44.def b/definitions/grib2/template.4.parameter_aerosol_44.def
index 019ce81f8..972919ccf 100644
--- a/definitions/grib2/template.4.parameter_aerosol_44.def
+++ b/definitions/grib2/template.4.parameter_aerosol_44.def
@@ -9,9 +9,6 @@
 
 # GRIB-530: This template is to be used by template.4.44.def ONLY
 
-
-label "Parameter information";
-
 #  Parameter category
 codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump;
 
diff --git a/definitions/grib2/template.4.parameter_aerosol_optical.def b/definitions/grib2/template.4.parameter_aerosol_optical.def
index b44a88263..09a62d30f 100644
--- a/definitions/grib2/template.4.parameter_aerosol_optical.def
+++ b/definitions/grib2/template.4.parameter_aerosol_optical.def
@@ -7,8 +7,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "Parameter information";
-
 #  Parameter category
 codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump;
 
diff --git a/definitions/grib2/template.4.parameter_chemical.def b/definitions/grib2/template.4.parameter_chemical.def
index a957b9f16..e91fb4b89 100644
--- a/definitions/grib2/template.4.parameter_chemical.def
+++ b/definitions/grib2/template.4.parameter_chemical.def
@@ -7,8 +7,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "Parameter information";
-
 #  Parameter category
 codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir): dump;
 
diff --git a/definitions/grib2/template.4.parameter_chemical_distribution.def b/definitions/grib2/template.4.parameter_chemical_distribution.def
index 456231d4f..c872b0e0d 100644
--- a/definitions/grib2/template.4.parameter_chemical_distribution.def
+++ b/definitions/grib2/template.4.parameter_chemical_distribution.def
@@ -7,8 +7,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "Parameter information";
-
 #  Parameter category
 codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir): dump;
 
diff --git a/definitions/grib2/template.4.parameter_partition.def b/definitions/grib2/template.4.parameter_partition.def
index 95c08c3e7..e17ea1aa5 100644
--- a/definitions/grib2/template.4.parameter_partition.def
+++ b/definitions/grib2/template.4.parameter_partition.def
@@ -7,8 +7,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "Parameter information";
-
 #  Parameter category
 codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump;
 
diff --git a/definitions/grib2/template.4.parameter_postproc.def b/definitions/grib2/template.4.parameter_postproc.def
index 81d411cbc..97decfec1 100644
--- a/definitions/grib2/template.4.parameter_postproc.def
+++ b/definitions/grib2/template.4.parameter_postproc.def
@@ -7,8 +7,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "Parameter information";
-
 #  Parameter category
 codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir): dump;
 
diff --git a/definitions/grib2/template.4.parameter_tile.def b/definitions/grib2/template.4.parameter_tile.def
index 010336f6f..508dcc6ee 100644
--- a/definitions/grib2/template.4.parameter_tile.def
+++ b/definitions/grib2/template.4.parameter_tile.def
@@ -7,8 +7,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "Tile information";
-
 #  Parameter category
 codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump;
 
diff --git a/definitions/grib2/template.4.percentile.def b/definitions/grib2/template.4.percentile.def
index 3bbd7a9ae..2f54e232f 100755
--- a/definitions/grib2/template.4.percentile.def
+++ b/definitions/grib2/template.4.percentile.def
@@ -7,8 +7,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "Percentile forecast";
-
 #  Percentile value
 # (from 100% to 0%)
 unsigned[1] percentileValue  : dump;
diff --git a/definitions/grib2/template.4.probability.def b/definitions/grib2/template.4.probability.def
index 1120c791a..85f07faa6 100755
--- a/definitions/grib2/template.4.probability.def
+++ b/definitions/grib2/template.4.probability.def
@@ -7,8 +7,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "Forecast probability";
-
 #  Forecast probability number
 unsigned[1] forecastProbabilityNumber  : dump;
 
diff --git a/definitions/grib2/template.4.rectangular_cluster.def b/definitions/grib2/template.4.rectangular_cluster.def
index 9dbc5c65b..8bd7b26b6 100755
--- a/definitions/grib2/template.4.rectangular_cluster.def
+++ b/definitions/grib2/template.4.rectangular_cluster.def
@@ -7,8 +7,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "Rectangular cluster";
-
 #  Cluster identifier
 unsigned[1] clusterIdentifier : dump ;
 alias number=clusterIdentifier;
diff --git a/definitions/grib2/template.4.reforecast.def b/definitions/grib2/template.4.reforecast.def
index 84e77ea92..53bdf4351 100644
--- a/definitions/grib2/template.4.reforecast.def
+++ b/definitions/grib2/template.4.reforecast.def
@@ -1,5 +1,3 @@
-label "S2S reforecasts";
-
 # The Model Version Date
 # This is the date when the reforecast is produced with a particular version of the model
 
diff --git a/definitions/grib2/template.4.statistical.def b/definitions/grib2/template.4.statistical.def
index e543a3c22..72e4dd556 100644
--- a/definitions/grib2/template.4.statistical.def
+++ b/definitions/grib2/template.4.statistical.def
@@ -7,7 +7,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "statistical processing";
 #  Year of end of overall time interval
 unsigned[2] yearOfEndOfOverallTimeInterval =0 : edition_specific;
 
diff --git a/definitions/grib2/template.5.4.def b/definitions/grib2/template.5.4.def
index dbd99d47b..4be96b207 100644
--- a/definitions/grib2/template.5.4.def
+++ b/definitions/grib2/template.5.4.def
@@ -7,7 +7,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "grib 2 Section 5 template 5.4";
 # START 2/template.5.4 ----------------------------------------------------------------------
 # TEMPLATE 5.4, Grid point data - IEEE packing
 # added for conversion from other packing
diff --git a/definitions/grib2/template.5.6.def b/definitions/grib2/template.5.6.def
index 628ed37c5..6563024a7 100644
--- a/definitions/grib2/template.5.6.def
+++ b/definitions/grib2/template.5.6.def
@@ -7,7 +7,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "grib 2 Section 5 template 5.6";
 # START 2/template.5.6 ----------------------------------------------------------------------
 # Grid point data - Simple packing with preprocessing
 
diff --git a/definitions/grib2/template.5.61.def b/definitions/grib2/template.5.61.def
index e5215f20b..46a96a635 100644
--- a/definitions/grib2/template.5.61.def
+++ b/definitions/grib2/template.5.61.def
@@ -7,7 +7,6 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-label "grib 2 Section 5 template 5.61";
 # START 2/template.5.61 ----------------------------------------------------------------------
 # Grid point data - Simple packing with logarithmic preprocessing
 constant typeOfPreProcessing=1;
diff --git a/definitions/mars/base.def b/definitions/mars/base.def
index cc16a58ce..f5da9a369 100644
--- a/definitions/mars/base.def
+++ b/definitions/mars/base.def
@@ -1,2 +1,2 @@
-label "x";
+label "_x";
 
diff --git a/definitions/mars/eswi/grib.oper.3v.def b/definitions/mars/eswi/grib.oper.3v.def
index cc16a58ce..f5da9a369 100644
--- a/definitions/mars/eswi/grib.oper.3v.def
+++ b/definitions/mars/eswi/grib.oper.3v.def
@@ -1,2 +1,2 @@
-label "x";
+label "_x";
 
diff --git a/definitions/mars/eswi/grib.oper.4v.def b/definitions/mars/eswi/grib.oper.4v.def
index cc16a58ce..f5da9a369 100644
--- a/definitions/mars/eswi/grib.oper.4v.def
+++ b/definitions/mars/eswi/grib.oper.4v.def
@@ -1,2 +1,2 @@
-label "x";
+label "_x";
 
diff --git a/definitions/mars/eswi/grib.oper.an.def b/definitions/mars/eswi/grib.oper.an.def
index cc16a58ce..f5da9a369 100644
--- a/definitions/mars/eswi/grib.oper.an.def
+++ b/definitions/mars/eswi/grib.oper.an.def
@@ -1,2 +1,2 @@
-label "x";
+label "_x";
 
diff --git a/definitions/mars/eswi/grib.oper.si.def b/definitions/mars/eswi/grib.oper.si.def
index cc16a58ce..f5da9a369 100644
--- a/definitions/mars/eswi/grib.oper.si.def
+++ b/definitions/mars/eswi/grib.oper.si.def
@@ -1,2 +1,2 @@
-label "x";
+label "_x";
 
diff --git a/definitions/mars/grib.edmm.fg.def b/definitions/mars/grib.edmm.fg.def
index 93c7e8979..1c8b3082a 100644
--- a/definitions/mars/grib.edmm.fg.def
+++ b/definitions/mars/grib.edmm.fg.def
@@ -7,6 +7,5 @@
 #alias mars.step = startStep;
 #}
 
-label "x";
 alias mars.number=perturbationNumber;
 
diff --git a/definitions/mars/grib.lwda.4v.def b/definitions/mars/grib.lwda.4v.def
index 8890843c7..66e453379 100644
--- a/definitions/mars/grib.lwda.4v.def
+++ b/definitions/mars/grib.lwda.4v.def
@@ -1,3 +1,2 @@
-label "x";
 alias mars.anoffset=offsetToEndOf4DvarWindow;
 
diff --git a/definitions/mars/grib.lwda.an.def b/definitions/mars/grib.lwda.an.def
index 8890843c7..66e453379 100644
--- a/definitions/mars/grib.lwda.an.def
+++ b/definitions/mars/grib.lwda.an.def
@@ -1,3 +1,2 @@
-label "x";
 alias mars.anoffset=offsetToEndOf4DvarWindow;
 
diff --git a/definitions/mars/grib.lwda.ea.def b/definitions/mars/grib.lwda.ea.def
index 8890843c7..66e453379 100644
--- a/definitions/mars/grib.lwda.ea.def
+++ b/definitions/mars/grib.lwda.ea.def
@@ -1,3 +1,2 @@
-label "x";
 alias mars.anoffset=offsetToEndOf4DvarWindow;
 
diff --git a/definitions/mars/grib.lwda.ef.def b/definitions/mars/grib.lwda.ef.def
index 8890843c7..66e453379 100644
--- a/definitions/mars/grib.lwda.ef.def
+++ b/definitions/mars/grib.lwda.ef.def
@@ -1,3 +1,2 @@
-label "x";
 alias mars.anoffset=offsetToEndOf4DvarWindow;
 
diff --git a/definitions/mars/grib.lwda.me.def b/definitions/mars/grib.lwda.me.def
index 6a00ee4c4..61e244503 100644
--- a/definitions/mars/grib.lwda.me.def
+++ b/definitions/mars/grib.lwda.me.def
@@ -1,4 +1,3 @@
-label "model errors";
 #alias mars.number=perturbationNumber;
 alias mars.anoffset=offsetToEndOf4DvarWindow;
 
diff --git a/definitions/mars/grib.me.def b/definitions/mars/grib.me.def
index 54a486085..62336f480 100644
--- a/definitions/mars/grib.me.def
+++ b/definitions/mars/grib.me.def
@@ -1,3 +1,3 @@
-label "model errors";
+label "_model errors";
 #alias mars.number=perturbationNumber;
 
diff --git a/definitions/mars/grib.mnth.fg.def b/definitions/mars/grib.mnth.fg.def
index 086dc11d4..c11faa703 100644
--- a/definitions/mars/grib.mnth.fg.def
+++ b/definitions/mars/grib.mnth.fg.def
@@ -7,4 +7,4 @@
 #alias mars.step = startStep;
 #}
 
-label "x";
+label "_x";
diff --git a/examples/python/high_level_api.py b/examples/python/high_level_api.py
index ce79c988b..4ac88b325 100644
--- a/examples/python/high_level_api.py
+++ b/examples/python/high_level_api.py
@@ -28,9 +28,9 @@ for i1 in range(len(TEST_KEYS)):
 TEST_INDEX_OUTPUT = TESTGRIB
 TEST_STEPRANGE = ('0', '12', '18', '24', '6')
 # These keys should be available even if new keys are defined
-KNOWN_GRIB_KEYS = ['7777', 'EPS information', 'GRIBEditionNumber', 'N', 'NV',
+KNOWN_GRIB_KEYS = ['7777', 'GRIBEditionNumber', 'N', 'NV',
                    'Ni', 'Nj', 'PLPresent', 'PVPresent',
-                   'Parameter information', 'addEmptySection2',
+                   'addEmptySection2',
                    'addExtraLocalSection', 'alternativeRowScanning',
                    'angleDivisor', 'angleMultiplier', 'angularPrecision',
                    'average', 'backgroundProcess',
@@ -49,8 +49,6 @@ KNOWN_GRIB_KEYS = ['7777', 'EPS information', 'GRIBEditionNumber', 'N', 'NV',
                    'forecastTime', 'g2grid', 'gaussianGridName',
                    'genVertHeightCoords', 'generatingProcessIdentifier',
                    'getNumberOfValues', 'global', 'globalDomain',
-                   'grib 2 Section 5 DATA REPRESENTATION SECTION',
-                   'grib 2 Section 6 BIT-MAP SECTION', 'grib 2 Section 7 data',
                    'grib2LocalSectionNumber', 'grib2LocalSectionPresent',
                    'grib2divider', 'gridDefinitionDescription',
                    'gridDefinitionTemplateNumber',
@@ -131,7 +129,7 @@ KNOWN_GRIB_KEYS = ['7777', 'EPS information', 'GRIBEditionNumber', 'N', 'NV',
                    'unitsECMF', 'unitsOfFirstFixedSurface',
                    'unitsOfSecondFixedSurface', 'unpackedError',
                    'uvRelativeToGrid', 'validityDate', 'validityTime',
-                   'values', 'x', 'year']
+                   'values', 'year']
 KNOWN_BUFR_KEYS = ['edition', 'masterTableNumber', 'bufrHeaderSubCentre', 'bufrHeaderCentre',
                    'updateSequenceNumber', 'dataCategory', 'dataSubCategory', 'masterTablesVersionNumber',
                    'localTablesVersionNumber', 'typicalYearOfCentury', 'typicalMonth', 'typicalDay',
@@ -229,7 +227,7 @@ class TestGribMessage(unittest.TestCase):
             msg = GribMessage(grib_file)
             msg_keys = msg.keys()
             for key in KNOWN_GRIB_KEYS:
-                assert key in msg_keys
+                assert key in msg_keys, "key '%s' not found" % key
             # Size of message in bytes
             self.assertEqual(msg.size(), 160219)
             self.assertEqual(len(msg.keys()), len(msg))