Index: trunk/scripts/TagInfoExtract.java
===================================================================
--- trunk/scripts/TagInfoExtract.java	(revision 17743)
+++ trunk/scripts/TagInfoExtract.java	(revision 17744)
@@ -484,5 +484,5 @@
                 this.osm = new Node(LatLon.ZERO);
                 Environment env = applyStylesheet(osm);
-                Cascade c = env.mc.getCascade("default");
+                Cascade c = env.getCascade("default");
                 Object image = c.get("icon-image");
                 if (image instanceof MapPaintStyles.IconReference && !((MapPaintStyles.IconReference) image).isDeprecatedIcon()) {
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java	(revision 17743)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java	(revision 17744)
@@ -314,4 +314,12 @@
 
     /**
+     * Gets the current cascade for the current layer of this environment
+     * @return The cascade
+     */
+    public Cascade getCascade() {
+        return getCascade(null);
+    }
+
+    /**
      * Gets the current cascade for a given layer
      * @param layer The layer to use, <code>null</code> to use the layer of the {@link Environment}
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java	(revision 17743)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java	(revision 17744)
@@ -690,5 +690,5 @@
         @Override
         public boolean applies(Environment env) {
-            Cascade cascade = env.getCascade(env.layer);
+            Cascade cascade = env.getCascade();
             return cascade != null && (not ^ cascade.containsKey(id));
         }
@@ -866,5 +866,5 @@
         static boolean selected(Environment e) { // NO_UCD (unused code)
             if (e.mc != null) {
-                e.mc.getCascade(e.layer).setDefaultSelectedHandling(false);
+                e.getCascade().setDefaultSelectedHandling(false);
             }
             return e.osm.isSelected();
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java	(revision 17743)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java	(revision 17744)
@@ -77,5 +77,5 @@
      */
     public static AreaElement create(final Environment env) {
-        final Cascade c = env.mc.getCascade(env.layer);
+        final Cascade c = env.getCascade();
         MapImage fillImage = null;
         Color color;
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaIconElement.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaIconElement.java	(revision 17743)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaIconElement.java	(revision 17744)
@@ -57,5 +57,5 @@
      */
     public static AreaIconElement create(final Environment env) {
-        final Cascade c = env.mc.getCascade(env.layer);
+         final Cascade c = env.getCascade();
         MapImage iconImage = NodeElement.createIcon(env);
         if (iconImage != null) {
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/BoxTextElement.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/BoxTextElement.java	(revision 17743)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/BoxTextElement.java	(revision 17744)
@@ -216,5 +216,5 @@
         if (text.labelCompositionStrategy.compose(env.osm) == null) return null;
 
-        Cascade c = env.mc.getCascade(env.layer);
+        Cascade c = env.getCascade();
 
         HorizontalTextAlignment hAlign;
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java	(revision 17743)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java	(revision 17744)
@@ -312,6 +312,6 @@
 
     private static LineElement createImpl(Environment env, LineType type) {
-        Cascade c = env.mc.getCascade(env.layer);
-        Cascade cDef = env.mc.getCascade("default");
+        Cascade c = env.getCascade();
+        Cascade cDef = env.getCascade("default");
         Float width = computeWidth(type, c, cDef);
         if (width == null)
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java	(revision 17743)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java	(revision 17744)
@@ -76,5 +76,5 @@
         if (!allowDefault && symbol == null && mapImage == null) return null;
 
-        Cascade c = env.mc.getCascade(env.layer);
+        Cascade c = env.getCascade();
         RotationAngle rotationAngle = createRotationAngle(env);
         return new NodeElement(c, mapImage, symbol, defaultMajorZindex, rotationAngle);
@@ -102,5 +102,5 @@
 
     private static RotationAngle createRotationAngle(Environment env, String key) {
-        Cascade c = env.mc.getCascade(env.layer);
+        Cascade c = env.getCascade();
 
         RotationAngle rotationAngle = RotationAngle.NO_ROTATION;
@@ -145,5 +145,5 @@
         CheckParameterUtil.ensureParameterNotNull(keys, "keys");
 
-        Cascade c = env.mc.getCascade(env.layer);
+        Cascade c = env.getCascade();
 
         final IconReference iconRef = c.get(keys[ICON_IMAGE_IDX], null, IconReference.class, true);
@@ -151,5 +151,5 @@
             return null;
 
-        Cascade cDef = env.mc.getCascade("default");
+        Cascade cDef = env.getCascade("default");
 
         Float widthOnDefault = cDef.get(keys[ICON_WIDTH_IDX], null, Float.class);
@@ -196,5 +196,5 @@
      */
     private static Symbol createSymbol(Environment env) {
-        Cascade c = env.mc.getCascade(env.layer);
+        Cascade c = env.getCascade();
 
         Keyword shapeKW = c.get("symbol-shape", null, Keyword.class);
@@ -206,5 +206,5 @@
         }
 
-        Cascade cDef = env.mc.getCascade("default");
+        Cascade cDef = env.getCascade("default");
         Float sizeOnDefault = cDef.get("symbol-size", null, Float.class);
         if (sizeOnDefault != null && sizeOnDefault <= 0) {
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/RepeatImageElement.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/RepeatImageElement.java	(revision 17743)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/RepeatImageElement.java	(revision 17744)
@@ -109,5 +109,5 @@
         if (pattern == null)
             return null;
-        Cascade c = env.mc.getCascade(env.layer);
+        Cascade c = env.getCascade();
         float offset = c.get(REPEAT_IMAGE_OFFSET, 0f, Float.class);
         float spacing = c.get(REPEAT_IMAGE_SPACING, 0f, Float.class);
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextElement.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextElement.java	(revision 17743)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextElement.java	(revision 17744)
@@ -57,5 +57,5 @@
         if (text == null)
             return null;
-        final Cascade c = env.mc.getCascade(env.layer);
+        final Cascade c = env.getCascade();
 
         Keyword positionKeyword = c.get(AreaElement.TEXT_POSITION, null, Keyword.class);
@@ -74,5 +74,5 @@
      */
     public static TextElement createForContent(Environment env) {
-        final Cascade c = env.mc.getCascade(env.layer);
+        final Cascade c = env.getCascade();
         Keyword positionKeyword = c.get(AreaElement.TEXT_POSITION, null, Keyword.class);
         if (positionKeyword != null) {
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java	(revision 17743)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java	(revision 17744)
@@ -138,5 +138,5 @@
     public static TextLabel create(Environment env, Color defaultTextColor, boolean defaultAnnotate) {
         CheckParameterUtil.ensureParameterNotNull(defaultTextColor);
-        Cascade c = env.mc.getCascade(env.layer);
+        Cascade c = env.getCascade();
 
         LabelCompositionStrategy strategy = buildLabelCompositionStrategy(c, defaultAnnotate);