Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 6641)
+++ trunk/data/validator/combinations.mapcss	(revision 6645)
@@ -71,6 +71,8 @@
 *[source:height                ][!height],
 *[source:lanes                 ][!lanes],
-*[/source:(addr:)?postcode/    ][!addr:postcode],
-*[/source:(addr:)?housenumber/ ][!addr:housenumber],
+*[source:postcode              ][!addr:postcode],
+*[source:housenumber           ][!addr:housenumber],
+*[source:addr:postcode         ][!addr:postcode],
+*[source:addr:housenumber      ][!addr:housenumber],
 *[source:addr                  ][!/^addr:/],
 *[source:maxspeed              ][!/^maxspeed:?/] {
Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 6641)
+++ trunk/data/validator/deprecated.mapcss	(revision 6645)
@@ -179,5 +179,10 @@
 
 /* from http://wiki.openstreetmap.org/wiki/Conditional_restrictions#Deprecated_tags */
-*[/(day|date|hour)_(on|off)/][!restriction] {
+*[day_on][!restriction],
+*[day_off][!restriction],
+*[date_on][!restriction],
+*[date_off][!restriction],
+*[hour_on][!restriction],
+*[hour_off][!restriction] {
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "*:conditional";