[core, node, darwin, qt] Remove support for paint classes

12 files changed, 352 insertions, 379 deletions

diff --git a/include/mbgl/style/conversion/layer.hpp b/include/mbgl/style/conversion/layer.hpp
index 3a64c36bf5..1fe467165d 100644
--- a/include/mbgl/style/conversion/layer.hpp
+++ b/include/mbgl/style/conversion/layer.hpp
@@ -28,30 +28,23 @@ optional<Error> setLayoutProperty(Layer& layer, const std::string& name, const V
 }
 
 template <class V>
-optional<Error> setPaintProperty(Layer& layer, const std::string& name, const V& value, const optional<std::string>& klass) {
+optional<Error> setPaintProperty(Layer& layer, const std::string& name, const V& value) {
     static const auto setters = makePaintPropertySetters<V>();
     auto it = setters.find(name);
     if (it == setters.end()) {
         return Error { "property not found" };
     }
-    return it->second(layer, value, klass);
+    return it->second(layer, value);
 }
 
 template <class V>
 optional<Error> setPaintProperties(Layer& layer, const V& value) {
-    return eachMember(value, [&] (const std::string& paintName, const V& paintValue) -> optional<Error> {
-        if (paintName.compare(0, 5, "paint") != 0) {
-            return {};
-        }
-
-        optional<std::string> klass;
-        if (paintName.compare(0, 6, "paint.") == 0) {
-            klass = paintName.substr(6);
-        }
-
-        return eachMember(paintValue, [&] (const std::string& k, const V& v) {
-            return setPaintProperty(layer, k, v, klass);
-        });
+    auto paintValue = objectMember(value, "paint");
+    if (!paintValue) {
+        return {};
+    }
+    return eachMember(*paintValue, [&] (const std::string& k, const V& v) {
+        return setPaintProperty(layer, k, v);
     });
 }
 
diff --git a/include/mbgl/style/conversion/make_property_setters.hpp b/include/mbgl/style/conversion/make_property_setters.hpp
index 105cca99d6..582ac7079f 100644
--- a/include/mbgl/style/conversion/make_property_setters.hpp
+++ b/include/mbgl/style/conversion/make_property_setters.hpp
@@ -20,50 +20,50 @@ namespace conversion {
 
 template <class V>
 auto makeLayoutPropertySetters() {
-    std::unordered_map<std::string, LayoutPropertySetter<V>> result;
+    std::unordered_map<std::string, PropertySetter<V>> result;
 
     result["visibility"] = &setVisibility<V>;
 
 
-    result["line-cap"] = &setLayoutProperty<V, LineLayer, PropertyValue<LineCapType>, &LineLayer::setLineCap>;
-    result["line-join"] = &setLayoutProperty<V, LineLayer, PropertyValue<LineJoinType>, &LineLayer::setLineJoin>;
-    result["line-miter-limit"] = &setLayoutProperty<V, LineLayer, PropertyValue<float>, &LineLayer::setLineMiterLimit>;
-    result["line-round-limit"] = &setLayoutProperty<V, LineLayer, PropertyValue<float>, &LineLayer::setLineRoundLimit>;
-
-    result["symbol-placement"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<SymbolPlacementType>, &SymbolLayer::setSymbolPlacement>;
-    result["symbol-spacing"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setSymbolSpacing>;
-    result["symbol-avoid-edges"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setSymbolAvoidEdges>;
-    result["icon-allow-overlap"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setIconAllowOverlap>;
-    result["icon-ignore-placement"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setIconIgnorePlacement>;
-    result["icon-optional"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setIconOptional>;
-    result["icon-rotation-alignment"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<AlignmentType>, &SymbolLayer::setIconRotationAlignment>;
-    result["icon-size"] = &setLayoutProperty<V, SymbolLayer, DataDrivenPropertyValue<float>, &SymbolLayer::setIconSize>;
-    result["icon-text-fit"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<IconTextFitType>, &SymbolLayer::setIconTextFit>;
-    result["icon-text-fit-padding"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<std::array<float, 4>>, &SymbolLayer::setIconTextFitPadding>;
-    result["icon-image"] = &setLayoutProperty<V, SymbolLayer, DataDrivenPropertyValue<std::string>, &SymbolLayer::setIconImage>;
-    result["icon-rotate"] = &setLayoutProperty<V, SymbolLayer, DataDrivenPropertyValue<float>, &SymbolLayer::setIconRotate>;
-    result["icon-padding"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setIconPadding>;
-    result["icon-keep-upright"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setIconKeepUpright>;
-    result["icon-offset"] = &setLayoutProperty<V, SymbolLayer, DataDrivenPropertyValue<std::array<float, 2>>, &SymbolLayer::setIconOffset>;
-    result["text-pitch-alignment"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<AlignmentType>, &SymbolLayer::setTextPitchAlignment>;
-    result["text-rotation-alignment"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<AlignmentType>, &SymbolLayer::setTextRotationAlignment>;
-    result["text-field"] = &setLayoutProperty<V, SymbolLayer, DataDrivenPropertyValue<std::string>, &SymbolLayer::setTextField>;
-    result["text-font"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<std::vector<std::string>>, &SymbolLayer::setTextFont>;
-    result["text-size"] = &setLayoutProperty<V, SymbolLayer, DataDrivenPropertyValue<float>, &SymbolLayer::setTextSize>;
-    result["text-max-width"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setTextMaxWidth>;
-    result["text-line-height"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setTextLineHeight>;
-    result["text-letter-spacing"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setTextLetterSpacing>;
-    result["text-justify"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<TextJustifyType>, &SymbolLayer::setTextJustify>;
-    result["text-anchor"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<TextAnchorType>, &SymbolLayer::setTextAnchor>;
-    result["text-max-angle"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setTextMaxAngle>;
-    result["text-rotate"] = &setLayoutProperty<V, SymbolLayer, DataDrivenPropertyValue<float>, &SymbolLayer::setTextRotate>;
-    result["text-padding"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setTextPadding>;
-    result["text-keep-upright"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setTextKeepUpright>;
-    result["text-transform"] = &setLayoutProperty<V, SymbolLayer, DataDrivenPropertyValue<TextTransformType>, &SymbolLayer::setTextTransform>;
-    result["text-offset"] = &setLayoutProperty<V, SymbolLayer, DataDrivenPropertyValue<std::array<float, 2>>, &SymbolLayer::setTextOffset>;
-    result["text-allow-overlap"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setTextAllowOverlap>;
-    result["text-ignore-placement"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setTextIgnorePlacement>;
-    result["text-optional"] = &setLayoutProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setTextOptional>;
+    result["line-cap"] = &setProperty<V, LineLayer, PropertyValue<LineCapType>, &LineLayer::setLineCap>;
+    result["line-join"] = &setProperty<V, LineLayer, PropertyValue<LineJoinType>, &LineLayer::setLineJoin>;
+    result["line-miter-limit"] = &setProperty<V, LineLayer, PropertyValue<float>, &LineLayer::setLineMiterLimit>;
+    result["line-round-limit"] = &setProperty<V, LineLayer, PropertyValue<float>, &LineLayer::setLineRoundLimit>;
+
+    result["symbol-placement"] = &setProperty<V, SymbolLayer, PropertyValue<SymbolPlacementType>, &SymbolLayer::setSymbolPlacement>;
+    result["symbol-spacing"] = &setProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setSymbolSpacing>;
+    result["symbol-avoid-edges"] = &setProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setSymbolAvoidEdges>;
+    result["icon-allow-overlap"] = &setProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setIconAllowOverlap>;
+    result["icon-ignore-placement"] = &setProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setIconIgnorePlacement>;
+    result["icon-optional"] = &setProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setIconOptional>;
+    result["icon-rotation-alignment"] = &setProperty<V, SymbolLayer, PropertyValue<AlignmentType>, &SymbolLayer::setIconRotationAlignment>;
+    result["icon-size"] = &setProperty<V, SymbolLayer, DataDrivenPropertyValue<float>, &SymbolLayer::setIconSize>;
+    result["icon-text-fit"] = &setProperty<V, SymbolLayer, PropertyValue<IconTextFitType>, &SymbolLayer::setIconTextFit>;
+    result["icon-text-fit-padding"] = &setProperty<V, SymbolLayer, PropertyValue<std::array<float, 4>>, &SymbolLayer::setIconTextFitPadding>;
+    result["icon-image"] = &setProperty<V, SymbolLayer, DataDrivenPropertyValue<std::string>, &SymbolLayer::setIconImage>;
+    result["icon-rotate"] = &setProperty<V, SymbolLayer, DataDrivenPropertyValue<float>, &SymbolLayer::setIconRotate>;
+    result["icon-padding"] = &setProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setIconPadding>;
+    result["icon-keep-upright"] = &setProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setIconKeepUpright>;
+    result["icon-offset"] = &setProperty<V, SymbolLayer, DataDrivenPropertyValue<std::array<float, 2>>, &SymbolLayer::setIconOffset>;
+    result["text-pitch-alignment"] = &setProperty<V, SymbolLayer, PropertyValue<AlignmentType>, &SymbolLayer::setTextPitchAlignment>;
+    result["text-rotation-alignment"] = &setProperty<V, SymbolLayer, PropertyValue<AlignmentType>, &SymbolLayer::setTextRotationAlignment>;
+    result["text-field"] = &setProperty<V, SymbolLayer, DataDrivenPropertyValue<std::string>, &SymbolLayer::setTextField>;
+    result["text-font"] = &setProperty<V, SymbolLayer, PropertyValue<std::vector<std::string>>, &SymbolLayer::setTextFont>;
+    result["text-size"] = &setProperty<V, SymbolLayer, DataDrivenPropertyValue<float>, &SymbolLayer::setTextSize>;
+    result["text-max-width"] = &setProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setTextMaxWidth>;
+    result["text-line-height"] = &setProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setTextLineHeight>;
+    result["text-letter-spacing"] = &setProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setTextLetterSpacing>;
+    result["text-justify"] = &setProperty<V, SymbolLayer, PropertyValue<TextJustifyType>, &SymbolLayer::setTextJustify>;
+    result["text-anchor"] = &setProperty<V, SymbolLayer, PropertyValue<TextAnchorType>, &SymbolLayer::setTextAnchor>;
+    result["text-max-angle"] = &setProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setTextMaxAngle>;
+    result["text-rotate"] = &setProperty<V, SymbolLayer, DataDrivenPropertyValue<float>, &SymbolLayer::setTextRotate>;
+    result["text-padding"] = &setProperty<V, SymbolLayer, PropertyValue<float>, &SymbolLayer::setTextPadding>;
+    result["text-keep-upright"] = &setProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setTextKeepUpright>;
+    result["text-transform"] = &setProperty<V, SymbolLayer, DataDrivenPropertyValue<TextTransformType>, &SymbolLayer::setTextTransform>;
+    result["text-offset"] = &setProperty<V, SymbolLayer, DataDrivenPropertyValue<std::array<float, 2>>, &SymbolLayer::setTextOffset>;
+    result["text-allow-overlap"] = &setProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setTextAllowOverlap>;
+    result["text-ignore-placement"] = &setProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setTextIgnorePlacement>;
+    result["text-optional"] = &setProperty<V, SymbolLayer, PropertyValue<bool>, &SymbolLayer::setTextOptional>;
 
 
 
@@ -74,129 +74,129 @@ auto makeLayoutPropertySetters() {
 
 template <class V>
 auto makePaintPropertySetters() {
-    std::unordered_map<std::string, PaintPropertySetter<V>> result;
+    std::unordered_map<std::string, PropertySetter<V>> result;
 
-    result["fill-antialias"] = &setPaintProperty<V, FillLayer, PropertyValue<bool>, &FillLayer::setFillAntialias>;
+    result["fill-antialias"] = &setProperty<V, FillLayer, PropertyValue<bool>, &FillLayer::setFillAntialias>;
     result["fill-antialias-transition"] = &setTransition<V, FillLayer, &FillLayer::setFillAntialiasTransition>;
-    result["fill-opacity"] = &setPaintProperty<V, FillLayer, DataDrivenPropertyValue<float>, &FillLayer::setFillOpacity>;
+    result["fill-opacity"] = &setProperty<V, FillLayer, DataDrivenPropertyValue<float>, &FillLayer::setFillOpacity>;
     result["fill-opacity-transition"] = &setTransition<V, FillLayer, &FillLayer::setFillOpacityTransition>;
-    result["fill-color"] = &setPaintProperty<V, FillLayer, DataDrivenPropertyValue<Color>, &FillLayer::setFillColor>;
+    result["fill-color"] = &setProperty<V, FillLayer, DataDrivenPropertyValue<Color>, &FillLayer::setFillColor>;
     result["fill-color-transition"] = &setTransition<V, FillLayer, &FillLayer::setFillColorTransition>;
-    result["fill-outline-color"] = &setPaintProperty<V, FillLayer, DataDrivenPropertyValue<Color>, &FillLayer::setFillOutlineColor>;
+    result["fill-outline-color"] = &setProperty<V, FillLayer, DataDrivenPropertyValue<Color>, &FillLayer::setFillOutlineColor>;
     result["fill-outline-color-transition"] = &setTransition<V, FillLayer, &FillLayer::setFillOutlineColorTransition>;
-    result["fill-translate"] = &setPaintProperty<V, FillLayer, PropertyValue<std::array<float, 2>>, &FillLayer::setFillTranslate>;
+    result["fill-translate"] = &setProperty<V, FillLayer, PropertyValue<std::array<float, 2>>, &FillLayer::setFillTranslate>;
     result["fill-translate-transition"] = &setTransition<V, FillLayer, &FillLayer::setFillTranslateTransition>;
-    result["fill-translate-anchor"] = &setPaintProperty<V, FillLayer, PropertyValue<TranslateAnchorType>, &FillLayer::setFillTranslateAnchor>;
+    result["fill-translate-anchor"] = &setProperty<V, FillLayer, PropertyValue<TranslateAnchorType>, &FillLayer::setFillTranslateAnchor>;
     result["fill-translate-anchor-transition"] = &setTransition<V, FillLayer, &FillLayer::setFillTranslateAnchorTransition>;
-    result["fill-pattern"] = &setPaintProperty<V, FillLayer, PropertyValue<std::string>, &FillLayer::setFillPattern>;
+    result["fill-pattern"] = &setProperty<V, FillLayer, PropertyValue<std::string>, &FillLayer::setFillPattern>;
     result["fill-pattern-transition"] = &setTransition<V, FillLayer, &FillLayer::setFillPatternTransition>;
 
-    result["line-opacity"] = &setPaintProperty<V, LineLayer, DataDrivenPropertyValue<float>, &LineLayer::setLineOpacity>;
+    result["line-opacity"] = &setProperty<V, LineLayer, DataDrivenPropertyValue<float>, &LineLayer::setLineOpacity>;
     result["line-opacity-transition"] = &setTransition<V, LineLayer, &LineLayer::setLineOpacityTransition>;
-    result["line-color"] = &setPaintProperty<V, LineLayer, DataDrivenPropertyValue<Color>, &LineLayer::setLineColor>;
+    result["line-color"] = &setProperty<V, LineLayer, DataDrivenPropertyValue<Color>, &LineLayer::setLineColor>;
     result["line-color-transition"] = &setTransition<V, LineLayer, &LineLayer::setLineColorTransition>;
-    result["line-translate"] = &setPaintProperty<V, LineLayer, PropertyValue<std::array<float, 2>>, &LineLayer::setLineTranslate>;
+    result["line-translate"] = &setProperty<V, LineLayer, PropertyValue<std::array<float, 2>>, &LineLayer::setLineTranslate>;
     result["line-translate-transition"] = &setTransition<V, LineLayer, &LineLayer::setLineTranslateTransition>;
-    result["line-translate-anchor"] = &setPaintProperty<V, LineLayer, PropertyValue<TranslateAnchorType>, &LineLayer::setLineTranslateAnchor>;
+    result["line-translate-anchor"] = &setProperty<V, LineLayer, PropertyValue<TranslateAnchorType>, &LineLayer::setLineTranslateAnchor>;
     result["line-translate-anchor-transition"] = &setTransition<V, LineLayer, &LineLayer::setLineTranslateAnchorTransition>;
-    result["line-width"] = &setPaintProperty<V, LineLayer, PropertyValue<float>, &LineLayer::setLineWidth>;
+    result["line-width"] = &setProperty<V, LineLayer, PropertyValue<float>, &LineLayer::setLineWidth>;
     result["line-width-transition"] = &setTransition<V, LineLayer, &LineLayer::setLineWidthTransition>;
-    result["line-gap-width"] = &setPaintProperty<V, LineLayer, DataDrivenPropertyValue<float>, &LineLayer::setLineGapWidth>;
+    result["line-gap-width"] = &setProperty<V, LineLayer, DataDrivenPropertyValue<float>, &LineLayer::setLineGapWidth>;
     result["line-gap-width-transition"] = &setTransition<V, LineLayer, &LineLayer::setLineGapWidthTransition>;
-    result["line-offset"] = &setPaintProperty<V, LineLayer, DataDrivenPropertyValue<float>, &LineLayer::setLineOffset>;
+    result["line-offset"] = &setProperty<V, LineLayer, DataDrivenPropertyValue<float>, &LineLayer::setLineOffset>;
     result["line-offset-transition"] = &setTransition<V, LineLayer, &LineLayer::setLineOffsetTransition>;
-    result["line-blur"] = &setPaintProperty<V, LineLayer, DataDrivenPropertyValue<float>, &LineLayer::setLineBlur>;
+    result["line-blur"] = &setProperty<V, LineLayer, DataDrivenPropertyValue<float>, &LineLayer::setLineBlur>;
     result["line-blur-transition"] = &setTransition<V, LineLayer, &LineLayer::setLineBlurTransition>;
-    result["line-dasharray"] = &setPaintProperty<V, LineLayer, PropertyValue<std::vector<float>>, &LineLayer::setLineDasharray>;
+    result["line-dasharray"] = &setProperty<V, LineLayer, PropertyValue<std::vector<float>>, &LineLayer::setLineDasharray>;
     result["line-dasharray-transition"] = &setTransition<V, LineLayer, &LineLayer::setLineDasharrayTransition>;
-    result["line-pattern"] = &setPaintProperty<V, LineLayer, PropertyValue<std::string>, &LineLayer::setLinePattern>;
+    result["line-pattern"] = &setProperty<V, LineLayer, PropertyValue<std::string>, &LineLayer::setLinePattern>;
     result["line-pattern-transition"] = &setTransition<V, LineLayer, &LineLayer::setLinePatternTransition>;
 
-    result["icon-opacity"] = &setPaintProperty<V, SymbolLayer, DataDrivenPropertyValue<float>, &SymbolLayer::setIconOpacity>;
+    result["icon-opacity"] = &setProperty<V, SymbolLayer, DataDrivenPropertyValue<float>, &SymbolLayer::setIconOpacity>;
     result["icon-opacity-transition"] = &setTransition<V, SymbolLayer, &SymbolLayer::setIconOpacityTransition>;
-    result["icon-color"] = &setPaintProperty<V, SymbolLayer, DataDrivenPropertyValue<Color>, &SymbolLayer::setIconColor>;
+    result["icon-color"] = &setProperty<V, SymbolLayer, DataDrivenPropertyValue<Color>, &SymbolLayer::setIconColor>;
     result["icon-color-transition"] = &setTransition<V, SymbolLayer, &SymbolLayer::setIconColorTransition>;
-    result["icon-halo-color"] = &setPaintProperty<V, SymbolLayer, DataDrivenPropertyValue<Color>, &SymbolLayer::setIconHaloColor>;
+    result["icon-halo-color"] = &setProperty<V, SymbolLayer, DataDrivenPropertyValue<Color>, &SymbolLayer::setIconHaloColor>;
     result["icon-halo-color-transition"] = &setTransition<V, SymbolLayer, &SymbolLayer::setIconHaloColorTransition>;
-    result["icon-halo-width"] = &setPaintProperty<V, SymbolLayer, DataDrivenPropertyValue<float>, &SymbolLayer::setIconHaloWidth>;
+    result["icon-halo-width"] = &setProperty<V, SymbolLayer, DataDrivenPropertyValue<float>, &SymbolLayer::setIconHaloWidth>;
     result["icon-halo-width-transition"] = &setTransition<V, SymbolLayer, &SymbolLayer::setIconHaloWidthTransition>;
-    result["icon-halo-blur"] = &setPaintProperty<V, SymbolLayer, DataDrivenPropertyValue<float>, &SymbolLayer::setIconHaloBlur>;
+    result["icon-halo-blur"] = &setProperty<V, SymbolLayer, DataDrivenPropertyValue<float>, &SymbolLayer::setIconHaloBlur>;
     result["icon-halo-blur-transition"] = &setTransition<V, SymbolLayer, &SymbolLayer::setIconHaloBlurTransition>;
-    result["icon-translate"] = &setPaintProperty<V, SymbolLayer, PropertyValue<std::array<float, 2>>, &SymbolLayer::setIconTranslate>;
+    result["icon-translate"] = &setProperty<V, SymbolLayer, PropertyValue<std::array<float, 2>>, &SymbolLayer::setIconTranslate>;
     result["icon-translate-transition"] = &setTransition<V, SymbolLayer, &SymbolLayer::setIconTranslateTransition>;
-    result["icon-translate-anchor"] = &setPaintProperty<V, SymbolLayer, PropertyValue<TranslateAnchorType>, &SymbolLayer::setIconTranslateAnchor>;
+    result["icon-translate-anchor"] = &setProperty<V, SymbolLayer, PropertyValue<TranslateAnchorType>, &SymbolLayer::setIconTranslateAnchor>;
     result["icon-translate-anchor-transition"] = &setTransition<V, SymbolLayer, &SymbolLayer::setIconTranslateAnchorTransition>;
-    result["text-opacity"] = &setPaintProperty<V, SymbolLayer, DataDrivenPropertyValue<float>, &SymbolLayer::setTextOpacity>;
+    result["text-opacity"] = &setProperty<V, SymbolLayer, DataDrivenPropertyValue<float>, &SymbolLayer::setTextOpacity>;
     result["text-opacity-transition"] = &setTransition<V, SymbolLayer, &SymbolLayer::setTextOpacityTransition>;
-    result["text-color"] = &setPaintProperty<V, SymbolLayer, DataDrivenPropertyValue<Color>, &SymbolLayer::setTextColor>;
+    result["text-color"] = &setProperty<V, SymbolLayer, DataDrivenPropertyValue<Color>, &SymbolLayer::setTextColor>;
     result["text-color-transition"] = &setTransition<V, SymbolLayer, &SymbolLayer::setTextColorTransition>;
-    result["text-halo-color"] = &setPaintProperty<V, SymbolLayer, DataDrivenPropertyValue<Color>, &SymbolLayer::setTextHaloColor>;
+    result["text-halo-color"] = &setProperty<V, SymbolLayer, DataDrivenPropertyValue<Color>, &SymbolLayer::setTextHaloColor>;
     result["text-halo-color-transition"] = &setTransition<V, SymbolLayer, &SymbolLayer::setTextHaloColorTransition>;
-    result["text-halo-width"] = &setPaintProperty<V, SymbolLayer, DataDrivenPropertyValue<float>, &SymbolLayer::setTextHaloWidth>;
+    result["text-halo-width"] = &setProperty<V, SymbolLayer, DataDrivenPropertyValue<float>, &SymbolLayer::setTextHaloWidth>;
     result["text-halo-width-transition"] = &setTransition<V, SymbolLayer, &SymbolLayer::setTextHaloWidthTransition>;
-    result["text-halo-blur"] = &setPaintProperty<V, SymbolLayer, DataDrivenPropertyValue<float>, &SymbolLayer::setTextHaloBlur>;
+    result["text-halo-blur"] = &setProperty<V, SymbolLayer, DataDrivenPropertyValue<float>, &SymbolLayer::setTextHaloBlur>;
     result["text-halo-blur-transition"] = &setTransition<V, SymbolLayer, &SymbolLayer::setTextHaloBlurTransition>;
-    result["text-translate"] = &setPaintProperty<V, SymbolLayer, PropertyValue<std::array<float, 2>>, &SymbolLayer::setTextTranslate>;
+    result["text-translate"] = &setProperty<V, SymbolLayer, PropertyValue<std::array<float, 2>>, &SymbolLayer::setTextTranslate>;
     result["text-translate-transition"] = &setTransition<V, SymbolLayer, &SymbolLayer::setTextTranslateTransition>;
-    result["text-translate-anchor"] = &setPaintProperty<V, SymbolLayer, PropertyValue<TranslateAnchorType>, &SymbolLayer::setTextTranslateAnchor>;
+    result["text-translate-anchor"] = &setProperty<V, SymbolLayer, PropertyValue<TranslateAnchorType>, &SymbolLayer::setTextTranslateAnchor>;
     result["text-translate-anchor-transition"] = &setTransition<V, SymbolLayer, &SymbolLayer::setTextTranslateAnchorTransition>;
 
-    result["circle-radius"] = &setPaintProperty<V, CircleLayer, DataDrivenPropertyValue<float>, &CircleLayer::setCircleRadius>;
+    result["circle-radius"] = &setProperty<V, CircleLayer, DataDrivenPropertyValue<float>, &CircleLayer::setCircleRadius>;
     result["circle-radius-transition"] = &setTransition<V, CircleLayer, &CircleLayer::setCircleRadiusTransition>;
-    result["circle-color"] = &setPaintProperty<V, CircleLayer, DataDrivenPropertyValue<Color>, &CircleLayer::setCircleColor>;
+    result["circle-color"] = &setProperty<V, CircleLayer, DataDrivenPropertyValue<Color>, &CircleLayer::setCircleColor>;
     result["circle-color-transition"] = &setTransition<V, CircleLayer, &CircleLayer::setCircleColorTransition>;
-    result["circle-blur"] = &setPaintProperty<V, CircleLayer, DataDrivenPropertyValue<float>, &CircleLayer::setCircleBlur>;
+    result["circle-blur"] = &setProperty<V, CircleLayer, DataDrivenPropertyValue<float>, &CircleLayer::setCircleBlur>;
     result["circle-blur-transition"] = &setTransition<V, CircleLayer, &CircleLayer::setCircleBlurTransition>;
-    result["circle-opacity"] = &setPaintProperty<V, CircleLayer, DataDrivenPropertyValue<float>, &CircleLayer::setCircleOpacity>;
+    result["circle-opacity"] = &setProperty<V, CircleLayer, DataDrivenPropertyValue<float>, &CircleLayer::setCircleOpacity>;
     result["circle-opacity-transition"] = &setTransition<V, CircleLayer, &CircleLayer::setCircleOpacityTransition>;
-    result["circle-translate"] = &setPaintProperty<V, CircleLayer, PropertyValue<std::array<float, 2>>, &CircleLayer::setCircleTranslate>;
+    result["circle-translate"] = &setProperty<V, CircleLayer, PropertyValue<std::array<float, 2>>, &CircleLayer::setCircleTranslate>;
     result["circle-translate-transition"] = &setTransition<V, CircleLayer, &CircleLayer::setCircleTranslateTransition>;
-    result["circle-translate-anchor"] = &setPaintProperty<V, CircleLayer, PropertyValue<TranslateAnchorType>, &CircleLayer::setCircleTranslateAnchor>;
+    result["circle-translate-anchor"] = &setProperty<V, CircleLayer, PropertyValue<TranslateAnchorType>, &CircleLayer::setCircleTranslateAnchor>;
     result["circle-translate-anchor-transition"] = &setTransition<V, CircleLayer, &CircleLayer::setCircleTranslateAnchorTransition>;
-    result["circle-pitch-scale"] = &setPaintProperty<V, CircleLayer, PropertyValue<CirclePitchScaleType>, &CircleLayer::setCirclePitchScale>;
+    result["circle-pitch-scale"] = &setProperty<V, CircleLayer, PropertyValue<CirclePitchScaleType>, &CircleLayer::setCirclePitchScale>;
     result["circle-pitch-scale-transition"] = &setTransition<V, CircleLayer, &CircleLayer::setCirclePitchScaleTransition>;
-    result["circle-stroke-width"] = &setPaintProperty<V, CircleLayer, DataDrivenPropertyValue<float>, &CircleLayer::setCircleStrokeWidth>;
+    result["circle-stroke-width"] = &setProperty<V, CircleLayer, DataDrivenPropertyValue<float>, &CircleLayer::setCircleStrokeWidth>;
     result["circle-stroke-width-transition"] = &setTransition<V, CircleLayer, &CircleLayer::setCircleStrokeWidthTransition>;
-    result["circle-stroke-color"] = &setPaintProperty<V, CircleLayer, DataDrivenPropertyValue<Color>, &CircleLayer::setCircleStrokeColor>;
+    result["circle-stroke-color"] = &setProperty<V, CircleLayer, DataDrivenPropertyValue<Color>, &CircleLayer::setCircleStrokeColor>;
     result["circle-stroke-color-transition"] = &setTransition<V, CircleLayer, &CircleLayer::setCircleStrokeColorTransition>;
-    result["circle-stroke-opacity"] = &setPaintProperty<V, CircleLayer, DataDrivenPropertyValue<float>, &CircleLayer::setCircleStrokeOpacity>;
+    result["circle-stroke-opacity"] = &setProperty<V, CircleLayer, DataDrivenPropertyValue<float>, &CircleLayer::setCircleStrokeOpacity>;
     result["circle-stroke-opacity-transition"] = &setTransition<V, CircleLayer, &CircleLayer::setCircleStrokeOpacityTransition>;
 
-    result["fill-extrusion-opacity"] = &setPaintProperty<V, FillExtrusionLayer, PropertyValue<float>, &FillExtrusionLayer::setFillExtrusionOpacity>;
+    result["fill-extrusion-opacity"] = &setProperty<V, FillExtrusionLayer, PropertyValue<float>, &FillExtrusionLayer::setFillExtrusionOpacity>;
     result["fill-extrusion-opacity-transition"] = &setTransition<V, FillExtrusionLayer, &FillExtrusionLayer::setFillExtrusionOpacityTransition>;
-    result["fill-extrusion-color"] = &setPaintProperty<V, FillExtrusionLayer, DataDrivenPropertyValue<Color>, &FillExtrusionLayer::setFillExtrusionColor>;
+    result["fill-extrusion-color"] = &setProperty<V, FillExtrusionLayer, DataDrivenPropertyValue<Color>, &FillExtrusionLayer::setFillExtrusionColor>;
     result["fill-extrusion-color-transition"] = &setTransition<V, FillExtrusionLayer, &FillExtrusionLayer::setFillExtrusionColorTransition>;
-    result["fill-extrusion-translate"] = &setPaintProperty<V, FillExtrusionLayer, PropertyValue<std::array<float, 2>>, &FillExtrusionLayer::setFillExtrusionTranslate>;
+    result["fill-extrusion-translate"] = &setProperty<V, FillExtrusionLayer, PropertyValue<std::array<float, 2>>, &FillExtrusionLayer::setFillExtrusionTranslate>;
     result["fill-extrusion-translate-transition"] = &setTransition<V, FillExtrusionLayer, &FillExtrusionLayer::setFillExtrusionTranslateTransition>;
-    result["fill-extrusion-translate-anchor"] = &setPaintProperty<V, FillExtrusionLayer, PropertyValue<TranslateAnchorType>, &FillExtrusionLayer::setFillExtrusionTranslateAnchor>;
+    result["fill-extrusion-translate-anchor"] = &setProperty<V, FillExtrusionLayer, PropertyValue<TranslateAnchorType>, &FillExtrusionLayer::setFillExtrusionTranslateAnchor>;
     result["fill-extrusion-translate-anchor-transition"] = &setTransition<V, FillExtrusionLayer, &FillExtrusionLayer::setFillExtrusionTranslateAnchorTransition>;
-    result["fill-extrusion-pattern"] = &setPaintProperty<V, FillExtrusionLayer, PropertyValue<std::string>, &FillExtrusionLayer::setFillExtrusionPattern>;
+    result["fill-extrusion-pattern"] = &setProperty<V, FillExtrusionLayer, PropertyValue<std::string>, &FillExtrusionLayer::setFillExtrusionPattern>;
     result["fill-extrusion-pattern-transition"] = &setTransition<V, FillExtrusionLayer, &FillExtrusionLayer::setFillExtrusionPatternTransition>;
-    result["fill-extrusion-height"] = &setPaintProperty<V, FillExtrusionLayer, DataDrivenPropertyValue<float>, &FillExtrusionLayer::setFillExtrusionHeight>;
+    result["fill-extrusion-height"] = &setProperty<V, FillExtrusionLayer, DataDrivenPropertyValue<float>, &FillExtrusionLayer::setFillExtrusionHeight>;
     result["fill-extrusion-height-transition"] = &setTransition<V, FillExtrusionLayer, &FillExtrusionLayer::setFillExtrusionHeightTransition>;
-    result["fill-extrusion-base"] = &setPaintProperty<V, FillExtrusionLayer, DataDrivenPropertyValue<float>, &FillExtrusionLayer::setFillExtrusionBase>;
+    result["fill-extrusion-base"] = &setProperty<V, FillExtrusionLayer, DataDrivenPropertyValue<float>, &FillExtrusionLayer::setFillExtrusionBase>;
     result["fill-extrusion-base-transition"] = &setTransition<V, FillExtrusionLayer, &FillExtrusionLayer::setFillExtrusionBaseTransition>;
 
-    result["raster-opacity"] = &setPaintProperty<V, RasterLayer, PropertyValue<float>, &RasterLayer::setRasterOpacity>;
+    result["raster-opacity"] = &setProperty<V, RasterLayer, PropertyValue<float>, &RasterLayer::setRasterOpacity>;
     result["raster-opacity-transition"] = &setTransition<V, RasterLayer, &RasterLayer::setRasterOpacityTransition>;
-    result["raster-hue-rotate"] = &setPaintProperty<V, RasterLayer, PropertyValue<float>, &RasterLayer::setRasterHueRotate>;
+    result["raster-hue-rotate"] = &setProperty<V, RasterLayer, PropertyValue<float>, &RasterLayer::setRasterHueRotate>;
     result["raster-hue-rotate-transition"] = &setTransition<V, RasterLayer, &RasterLayer::setRasterHueRotateTransition>;
-    result["raster-brightness-min"] = &setPaintProperty<V, RasterLayer, PropertyValue<float>, &RasterLayer::setRasterBrightnessMin>;
+    result["raster-brightness-min"] = &setProperty<V, RasterLayer, PropertyValue<float>, &RasterLayer::setRasterBrightnessMin>;
     result["raster-brightness-min-transition"] = &setTransition<V, RasterLayer, &RasterLayer::setRasterBrightnessMinTransition>;
-    result["raster-brightness-max"] = &setPaintProperty<V, RasterLayer, PropertyValue<float>, &RasterLayer::setRasterBrightnessMax>;
+    result["raster-brightness-max"] = &setProperty<V, RasterLayer, PropertyValue<float>, &RasterLayer::setRasterBrightnessMax>;
     result["raster-brightness-max-transition"] = &setTransition<V, RasterLayer, &RasterLayer::setRasterBrightnessMaxTransition>;
-    result["raster-saturation"] = &setPaintProperty<V, RasterLayer, PropertyValue<float>, &RasterLayer::setRasterSaturation>;
+    result["raster-saturation"] = &setProperty<V, RasterLayer, PropertyValue<float>, &RasterLayer::setRasterSaturation>;
     result["raster-saturation-transition"] = &setTransition<V, RasterLayer, &RasterLayer::setRasterSaturationTransition>;
-    result["raster-contrast"] = &setPaintProperty<V, RasterLayer, PropertyValue<float>, &RasterLayer::setRasterContrast>;
+    result["raster-contrast"] = &setProperty<V, RasterLayer, PropertyValue<float>, &RasterLayer::setRasterContrast>;
     result["raster-contrast-transition"] = &setTransition<V, RasterLayer, &RasterLayer::setRasterContrastTransition>;
-    result["raster-fade-duration"] = &setPaintProperty<V, RasterLayer, PropertyValue<float>, &RasterLayer::setRasterFadeDuration>;
+    result["raster-fade-duration"] = &setProperty<V, RasterLayer, PropertyValue<float>, &RasterLayer::setRasterFadeDuration>;
     result["raster-fade-duration-transition"] = &setTransition<V, RasterLayer, &RasterLayer::setRasterFadeDurationTransition>;
 
-    result["background-color"] = &setPaintProperty<V, BackgroundLayer, PropertyValue<Color>, &BackgroundLayer::setBackgroundColor>;
+    result["background-color"] = &setProperty<V, BackgroundLayer, PropertyValue<Color>, &BackgroundLayer::setBackgroundColor>;
     result["background-color-transition"] = &setTransition<V, BackgroundLayer, &BackgroundLayer::setBackgroundColorTransition>;
-    result["background-pattern"] = &setPaintProperty<V, BackgroundLayer, PropertyValue<std::string>, &BackgroundLayer::setBackgroundPattern>;
+    result["background-pattern"] = &setProperty<V, BackgroundLayer, PropertyValue<std::string>, &BackgroundLayer::setBackgroundPattern>;
     result["background-pattern-transition"] = &setTransition<V, BackgroundLayer, &BackgroundLayer::setBackgroundPatternTransition>;
-    result["background-opacity"] = &setPaintProperty<V, BackgroundLayer, PropertyValue<float>, &BackgroundLayer::setBackgroundOpacity>;
+    result["background-opacity"] = &setProperty<V, BackgroundLayer, PropertyValue<float>, &BackgroundLayer::setBackgroundOpacity>;
     result["background-opacity-transition"] = &setTransition<V, BackgroundLayer, &BackgroundLayer::setBackgroundOpacityTransition>;
 
     return result;
diff --git a/include/mbgl/style/conversion/make_property_setters.hpp.ejs b/include/mbgl/style/conversion/make_property_setters.hpp.ejs
index a99e75aec7..19c9f70538 100644
--- a/include/mbgl/style/conversion/make_property_setters.hpp.ejs
+++ b/include/mbgl/style/conversion/make_property_setters.hpp.ejs
@@ -16,13 +16,13 @@ namespace conversion {
 
 template <class V>
 auto makeLayoutPropertySetters() {
-    std::unordered_map<std::string, LayoutPropertySetter<V>> result;
+    std::unordered_map<std::string, PropertySetter<V>> result;
 
     result["visibility"] = &setVisibility<V>;
 
 <% for (const layer of locals.layers) { -%>
 <% for (const property of layer.layoutProperties) { -%>
-    result["<%- property.name %>"] = &setLayoutProperty<V, <%- camelize(layer.type) %>Layer, <%- propertyValueType(property) %>, &<%- camelize(layer.type) %>Layer::set<%- camelize(property.name) %>>;
+    result["<%- property.name %>"] = &setProperty<V, <%- camelize(layer.type) %>Layer, <%- propertyValueType(property) %>, &<%- camelize(layer.type) %>Layer::set<%- camelize(property.name) %>>;
 <% } -%>
 
 <% } -%>
@@ -31,11 +31,11 @@ auto makeLayoutPropertySetters() {
 
 template <class V>
 auto makePaintPropertySetters() {
-    std::unordered_map<std::string, PaintPropertySetter<V>> result;
+    std::unordered_map<std::string, PropertySetter<V>> result;
 
 <% for (const layer of locals.layers) { -%>
 <% for (const property of layer.paintProperties) { -%>
-    result["<%- property.name %>"] = &setPaintProperty<V, <%- camelize(layer.type) %>Layer, <%- propertyValueType(property) %>, &<%- camelize(layer.type) %>Layer::set<%- camelize(property.name) %>>;
+    result["<%- property.name %>"] = &setProperty<V, <%- camelize(layer.type) %>Layer, <%- propertyValueType(property) %>, &<%- camelize(layer.type) %>Layer::set<%- camelize(property.name) %>>;
     result["<%- property.name %>-transition"] = &setTransition<V, <%- camelize(layer.type) %>Layer, &<%- camelize(layer.type) %>Layer::set<%- camelize(property.name) %>Transition>;
 <% } -%>
 
diff --git a/include/mbgl/style/conversion/property_setter.hpp b/include/mbgl/style/conversion/property_setter.hpp
index 8658fd60b0..759c4512cc 100644
--- a/include/mbgl/style/conversion/property_setter.hpp
+++ b/include/mbgl/style/conversion/property_setter.hpp
@@ -14,13 +14,10 @@ namespace style {
 namespace conversion {
 
 template <class V>
-using LayoutPropertySetter = optional<Error> (*) (Layer&, const V&);
-
-template <class V>
-using PaintPropertySetter = optional<Error> (*) (Layer&, const V&, const optional<std::string>&);
+using PropertySetter = optional<Error> (*) (Layer&, const V&);
 
 template <class V, class L, class PropertyValue, void (L::*setter)(PropertyValue)>
-optional<Error> setLayoutProperty(Layer& layer, const V& value) {
+optional<Error> setProperty(Layer& layer, const V& value) {
     auto* typedLayer = layer.as<L>();
     if (!typedLayer) {
         return Error { "layer doesn't support this property" };
@@ -36,25 +33,8 @@ optional<Error> setLayoutProperty(Layer& layer, const V& value) {
     return {};
 }
 
-template <class V, class L, class PropertyValue, void (L::*setter)(PropertyValue, const optional<std::string>&)>
-optional<Error> setPaintProperty(Layer& layer, const V& value, const optional<std::string>& klass) {
-    auto* typedLayer = layer.as<L>();
-    if (!typedLayer) {
-        return Error { "layer doesn't support this property" };
-    }
-
-    Error error;
-    optional<PropertyValue> typedValue = convert<PropertyValue>(value, error);
-    if (!typedValue) {
-        return error;
-    }
-
-    (typedLayer->*setter)(*typedValue, klass);
-    return {};
-}
-
-template <class V, class L, void (L::*setter)(const TransitionOptions&, const optional<std::string>&)>
-optional<Error> setTransition(Layer& layer, const V& value, const optional<std::string>& klass) {
+template <class V, class L, void (L::*setter)(const TransitionOptions&)>
+optional<Error> setTransition(Layer& layer, const V& value) {
     auto* typedLayer = layer.as<L>();
     if (!typedLayer) {
         return Error { "layer doesn't support this property" };
@@ -66,7 +46,7 @@ optional<Error> setTransition(Layer& layer, const V& value, const optional<std::
         return error;
     }
 
-    (typedLayer->*setter)(*transition, klass);
+    (typedLayer->*setter)(*transition);
     return {};
 }
 
diff --git a/include/mbgl/style/layers/background_layer.hpp b/include/mbgl/style/layers/background_layer.hpp
index 63708a449f..903983844f 100644
--- a/include/mbgl/style/layers/background_layer.hpp
+++ b/include/mbgl/style/layers/background_layer.hpp
@@ -29,22 +29,22 @@ public:
     // Paint properties
 
     static PropertyValue<Color> getDefaultBackgroundColor();
-    PropertyValue<Color> getBackgroundColor(const optional<std::string>& klass = {}) const;
-    void setBackgroundColor(PropertyValue<Color>, const optional<std::string>& klass = {});
-    void setBackgroundColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getBackgroundColorTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<Color> getBackgroundColor() const;
+    void setBackgroundColor(PropertyValue<Color>);
+    void setBackgroundColorTransition(const TransitionOptions&);
+    TransitionOptions getBackgroundColorTransition() const;
 
     static PropertyValue<std::string> getDefaultBackgroundPattern();
-    PropertyValue<std::string> getBackgroundPattern(const optional<std::string>& klass = {}) const;
-    void setBackgroundPattern(PropertyValue<std::string>, const optional<std::string>& klass = {});
-    void setBackgroundPatternTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getBackgroundPatternTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<std::string> getBackgroundPattern() const;
+    void setBackgroundPattern(PropertyValue<std::string>);
+    void setBackgroundPatternTransition(const TransitionOptions&);
+    TransitionOptions getBackgroundPatternTransition() const;
 
     static PropertyValue<float> getDefaultBackgroundOpacity();
-    PropertyValue<float> getBackgroundOpacity(const optional<std::string>& klass = {}) const;
-    void setBackgroundOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
-    void setBackgroundOpacityTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getBackgroundOpacityTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<float> getBackgroundOpacity() const;
+    void setBackgroundOpacity(PropertyValue<float>);
+    void setBackgroundOpacityTransition(const TransitionOptions&);
+    TransitionOptions getBackgroundOpacityTransition() const;
 
     // Private implementation
 
diff --git a/include/mbgl/style/layers/circle_layer.hpp b/include/mbgl/style/layers/circle_layer.hpp
index f40c507e28..275a2e67a5 100644
--- a/include/mbgl/style/layers/circle_layer.hpp
+++ b/include/mbgl/style/layers/circle_layer.hpp
@@ -37,64 +37,64 @@ public:
     // Paint properties
 
     static DataDrivenPropertyValue<float> getDefaultCircleRadius();
-    DataDrivenPropertyValue<float> getCircleRadius(const optional<std::string>& klass = {}) const;
-    void setCircleRadius(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
-    void setCircleRadiusTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getCircleRadiusTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<float> getCircleRadius() const;
+    void setCircleRadius(DataDrivenPropertyValue<float>);
+    void setCircleRadiusTransition(const TransitionOptions&);
+    TransitionOptions getCircleRadiusTransition() const;
 
     static DataDrivenPropertyValue<Color> getDefaultCircleColor();
-    DataDrivenPropertyValue<Color> getCircleColor(const optional<std::string>& klass = {}) const;
-    void setCircleColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
-    void setCircleColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getCircleColorTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<Color> getCircleColor() const;
+    void setCircleColor(DataDrivenPropertyValue<Color>);
+    void setCircleColorTransition(const TransitionOptions&);
+    TransitionOptions getCircleColorTransition() const;
 
     static DataDrivenPropertyValue<float> getDefaultCircleBlur();
-    DataDrivenPropertyValue<float> getCircleBlur(const optional<std::string>& klass = {}) const;
-    void setCircleBlur(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
-    void setCircleBlurTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getCircleBlurTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<float> getCircleBlur() const;
+    void setCircleBlur(DataDrivenPropertyValue<float>);
+    void setCircleBlurTransition(const TransitionOptions&);
+    TransitionOptions getCircleBlurTransition() const;
 
     static DataDrivenPropertyValue<float> getDefaultCircleOpacity();
-    DataDrivenPropertyValue<float> getCircleOpacity(const optional<std::string>& klass = {}) const;
-    void setCircleOpacity(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
-    void setCircleOpacityTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getCircleOpacityTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<float> getCircleOpacity() const;
+    void setCircleOpacity(DataDrivenPropertyValue<float>);
+    void setCircleOpacityTransition(const TransitionOptions&);
+    TransitionOptions getCircleOpacityTransition() const;
 
     static PropertyValue<std::array<float, 2>> getDefaultCircleTranslate();
-    PropertyValue<std::array<float, 2>> getCircleTranslate(const optional<std::string>& klass = {}) const;
-    void setCircleTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {});
-    void setCircleTranslateTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getCircleTranslateTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<std::array<float, 2>> getCircleTranslate() const;
+    void setCircleTranslate(PropertyValue<std::array<float, 2>>);
+    void setCircleTranslateTransition(const TransitionOptions&);
+    TransitionOptions getCircleTranslateTransition() const;
 
     static PropertyValue<TranslateAnchorType> getDefaultCircleTranslateAnchor();
-    PropertyValue<TranslateAnchorType> getCircleTranslateAnchor(const optional<std::string>& klass = {}) const;
-    void setCircleTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {});
-    void setCircleTranslateAnchorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getCircleTranslateAnchorTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<TranslateAnchorType> getCircleTranslateAnchor() const;
+    void setCircleTranslateAnchor(PropertyValue<TranslateAnchorType>);
+    void setCircleTranslateAnchorTransition(const TransitionOptions&);
+    TransitionOptions getCircleTranslateAnchorTransition() const;
 
     static PropertyValue<CirclePitchScaleType> getDefaultCirclePitchScale();
-    PropertyValue<CirclePitchScaleType> getCirclePitchScale(const optional<std::string>& klass = {}) const;
-    void setCirclePitchScale(PropertyValue<CirclePitchScaleType>, const optional<std::string>& klass = {});
-    void setCirclePitchScaleTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getCirclePitchScaleTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<CirclePitchScaleType> getCirclePitchScale() const;
+    void setCirclePitchScale(PropertyValue<CirclePitchScaleType>);
+    void setCirclePitchScaleTransition(const TransitionOptions&);
+    TransitionOptions getCirclePitchScaleTransition() const;
 
     static DataDrivenPropertyValue<float> getDefaultCircleStrokeWidth();
-    DataDrivenPropertyValue<float> getCircleStrokeWidth(const optional<std::string>& klass = {}) const;
-    void setCircleStrokeWidth(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
-    void setCircleStrokeWidthTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getCircleStrokeWidthTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<float> getCircleStrokeWidth() const;
+    void setCircleStrokeWidth(DataDrivenPropertyValue<float>);
+    void setCircleStrokeWidthTransition(const TransitionOptions&);
+    TransitionOptions getCircleStrokeWidthTransition() const;
 
     static DataDrivenPropertyValue<Color> getDefaultCircleStrokeColor();
-    DataDrivenPropertyValue<Color> getCircleStrokeColor(const optional<std::string>& klass = {}) const;
-    void setCircleStrokeColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
-    void setCircleStrokeColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getCircleStrokeColorTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<Color> getCircleStrokeColor() const;
+    void setCircleStrokeColor(DataDrivenPropertyValue<Color>);
+    void setCircleStrokeColorTransition(const TransitionOptions&);
+    TransitionOptions getCircleStrokeColorTransition() const;
 
     static DataDrivenPropertyValue<float> getDefaultCircleStrokeOpacity();
-    DataDrivenPropertyValue<float> getCircleStrokeOpacity(const optional<std::string>& klass = {}) const;
-    void setCircleStrokeOpacity(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
-    void setCircleStrokeOpacityTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getCircleStrokeOpacityTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<float> getCircleStrokeOpacity() const;
+    void setCircleStrokeOpacity(DataDrivenPropertyValue<float>);
+    void setCircleStrokeOpacityTransition(const TransitionOptions&);
+    TransitionOptions getCircleStrokeOpacityTransition() const;
 
     // Private implementation
 
diff --git a/include/mbgl/style/layers/fill_extrusion_layer.hpp b/include/mbgl/style/layers/fill_extrusion_layer.hpp
index bc6890e82f..e1c54f54ee 100644
--- a/include/mbgl/style/layers/fill_extrusion_layer.hpp
+++ b/include/mbgl/style/layers/fill_extrusion_layer.hpp
@@ -37,46 +37,46 @@ public:
     // Paint properties
 
     static PropertyValue<float> getDefaultFillExtrusionOpacity();
-    PropertyValue<float> getFillExtrusionOpacity(const optional<std::string>& klass = {}) const;
-    void setFillExtrusionOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
-    void setFillExtrusionOpacityTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getFillExtrusionOpacityTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<float> getFillExtrusionOpacity() const;
+    void setFillExtrusionOpacity(PropertyValue<float>);
+    void setFillExtrusionOpacityTransition(const TransitionOptions&);
+    TransitionOptions getFillExtrusionOpacityTransition() const;
 
     static DataDrivenPropertyValue<Color> getDefaultFillExtrusionColor();
-    DataDrivenPropertyValue<Color> getFillExtrusionColor(const optional<std::string>& klass = {}) const;
-    void setFillExtrusionColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
-    void setFillExtrusionColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getFillExtrusionColorTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<Color> getFillExtrusionColor() const;
+    void setFillExtrusionColor(DataDrivenPropertyValue<Color>);
+    void setFillExtrusionColorTransition(const TransitionOptions&);
+    TransitionOptions getFillExtrusionColorTransition() const;
 
     static PropertyValue<std::array<float, 2>> getDefaultFillExtrusionTranslate();
-    PropertyValue<std::array<float, 2>> getFillExtrusionTranslate(const optional<std::string>& klass = {}) const;
-    void setFillExtrusionTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {});
-    void setFillExtrusionTranslateTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getFillExtrusionTranslateTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<std::array<float, 2>> getFillExtrusionTranslate() const;
+    void setFillExtrusionTranslate(PropertyValue<std::array<float, 2>>);
+    void setFillExtrusionTranslateTransition(const TransitionOptions&);
+    TransitionOptions getFillExtrusionTranslateTransition() const;
 
     static PropertyValue<TranslateAnchorType> getDefaultFillExtrusionTranslateAnchor();
-    PropertyValue<TranslateAnchorType> getFillExtrusionTranslateAnchor(const optional<std::string>& klass = {}) const;
-    void setFillExtrusionTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {});
-    void setFillExtrusionTranslateAnchorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getFillExtrusionTranslateAnchorTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<TranslateAnchorType> getFillExtrusionTranslateAnchor() const;
+    void setFillExtrusionTranslateAnchor(PropertyValue<TranslateAnchorType>);
+    void setFillExtrusionTranslateAnchorTransition(const TransitionOptions&);
+    TransitionOptions getFillExtrusionTranslateAnchorTransition() const;
 
     static PropertyValue<std::string> getDefaultFillExtrusionPattern();
-    PropertyValue<std::string> getFillExtrusionPattern(const optional<std::string>& klass = {}) const;
-    void setFillExtrusionPattern(PropertyValue<std::string>, const optional<std::string>& klass = {});
-    void setFillExtrusionPatternTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getFillExtrusionPatternTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<std::string> getFillExtrusionPattern() const;
+    void setFillExtrusionPattern(PropertyValue<std::string>);
+    void setFillExtrusionPatternTransition(const TransitionOptions&);
+    TransitionOptions getFillExtrusionPatternTransition() const;
 
     static DataDrivenPropertyValue<float> getDefaultFillExtrusionHeight();
-    DataDrivenPropertyValue<float> getFillExtrusionHeight(const optional<std::string>& klass = {}) const;
-    void setFillExtrusionHeight(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
-    void setFillExtrusionHeightTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getFillExtrusionHeightTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<float> getFillExtrusionHeight() const;
+    void setFillExtrusionHeight(DataDrivenPropertyValue<float>);
+    void setFillExtrusionHeightTransition(const TransitionOptions&);
+    TransitionOptions getFillExtrusionHeightTransition() const;
 
     static DataDrivenPropertyValue<float> getDefaultFillExtrusionBase();
-    DataDrivenPropertyValue<float> getFillExtrusionBase(const optional<std::string>& klass = {}) const;
-    void setFillExtrusionBase(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
-    void setFillExtrusionBaseTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getFillExtrusionBaseTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<float> getFillExtrusionBase() const;
+    void setFillExtrusionBase(DataDrivenPropertyValue<float>);
+    void setFillExtrusionBaseTransition(const TransitionOptions&);
+    TransitionOptions getFillExtrusionBaseTransition() const;
 
     // Private implementation
 
diff --git a/include/mbgl/style/layers/fill_layer.hpp b/include/mbgl/style/layers/fill_layer.hpp
index 3d08e75a1c..dfbe69d7fe 100644
--- a/include/mbgl/style/layers/fill_layer.hpp
+++ b/include/mbgl/style/layers/fill_layer.hpp
@@ -37,46 +37,46 @@ public:
     // Paint properties
 
     static PropertyValue<bool> getDefaultFillAntialias();
-    PropertyValue<bool> getFillAntialias(const optional<std::string>& klass = {}) const;
-    void setFillAntialias(PropertyValue<bool>, const optional<std::string>& klass = {});
-    void setFillAntialiasTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getFillAntialiasTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<bool> getFillAntialias() const;
+    void setFillAntialias(PropertyValue<bool>);
+    void setFillAntialiasTransition(const TransitionOptions&);
+    TransitionOptions getFillAntialiasTransition() const;
 
     static DataDrivenPropertyValue<float> getDefaultFillOpacity();
-    DataDrivenPropertyValue<float> getFillOpacity(const optional<std::string>& klass = {}) const;
-    void setFillOpacity(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
-    void setFillOpacityTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getFillOpacityTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<float> getFillOpacity() const;
+    void setFillOpacity(DataDrivenPropertyValue<float>);
+    void setFillOpacityTransition(const TransitionOptions&);
+    TransitionOptions getFillOpacityTransition() const;
 
     static DataDrivenPropertyValue<Color> getDefaultFillColor();
-    DataDrivenPropertyValue<Color> getFillColor(const optional<std::string>& klass = {}) const;
-    void setFillColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
-    void setFillColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getFillColorTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<Color> getFillColor() const;
+    void setFillColor(DataDrivenPropertyValue<Color>);
+    void setFillColorTransition(const TransitionOptions&);
+    TransitionOptions getFillColorTransition() const;
 
     static DataDrivenPropertyValue<Color> getDefaultFillOutlineColor();
-    DataDrivenPropertyValue<Color> getFillOutlineColor(const optional<std::string>& klass = {}) const;
-    void setFillOutlineColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
-    void setFillOutlineColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getFillOutlineColorTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<Color> getFillOutlineColor() const;
+    void setFillOutlineColor(DataDrivenPropertyValue<Color>);
+    void setFillOutlineColorTransition(const TransitionOptions&);
+    TransitionOptions getFillOutlineColorTransition() const;
 
     static PropertyValue<std::array<float, 2>> getDefaultFillTranslate();
-    PropertyValue<std::array<float, 2>> getFillTranslate(const optional<std::string>& klass = {}) const;
-    void setFillTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {});
-    void setFillTranslateTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getFillTranslateTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<std::array<float, 2>> getFillTranslate() const;
+    void setFillTranslate(PropertyValue<std::array<float, 2>>);
+    void setFillTranslateTransition(const TransitionOptions&);
+    TransitionOptions getFillTranslateTransition() const;
 
     static PropertyValue<TranslateAnchorType> getDefaultFillTranslateAnchor();
-    PropertyValue<TranslateAnchorType> getFillTranslateAnchor(const optional<std::string>& klass = {}) const;
-    void setFillTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {});
-    void setFillTranslateAnchorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getFillTranslateAnchorTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<TranslateAnchorType> getFillTranslateAnchor() const;
+    void setFillTranslateAnchor(PropertyValue<TranslateAnchorType>);
+    void setFillTranslateAnchorTransition(const TransitionOptions&);
+    TransitionOptions getFillTranslateAnchorTransition() const;
 
     static PropertyValue<std::string> getDefaultFillPattern();
-    PropertyValue<std::string> getFillPattern(const optional<std::string>& klass = {}) const;
-    void setFillPattern(PropertyValue<std::string>, const optional<std::string>& klass = {});
-    void setFillPatternTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getFillPatternTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<std::string> getFillPattern() const;
+    void setFillPattern(PropertyValue<std::string>);
+    void setFillPatternTransition(const TransitionOptions&);
+    TransitionOptions getFillPatternTransition() const;
 
     // Private implementation
 
diff --git a/include/mbgl/style/layers/layer.hpp.ejs b/include/mbgl/style/layers/layer.hpp.ejs
index 033ae88956..4ee5545247 100644
--- a/include/mbgl/style/layers/layer.hpp.ejs
+++ b/include/mbgl/style/layers/layer.hpp.ejs
@@ -65,10 +65,10 @@ public:
 
 <% for (const property of paintProperties) { -%>
     static <%- propertyValueType(property) %> getDefault<%- camelize(property.name) %>();
-    <%- propertyValueType(property) %> get<%- camelize(property.name) %>(const optional<std::string>& klass = {}) const;
-    void set<%- camelize(property.name) %>(<%- propertyValueType(property) %>, const optional<std::string>& klass = {});
-    void set<%- camelize(property.name) %>Transition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions get<%- camelize(property.name) %>Transition(const optional<std::string>& klass = {}) const;
+    <%- propertyValueType(property) %> get<%- camelize(property.name) %>() const;
+    void set<%- camelize(property.name) %>(<%- propertyValueType(property) %>);
+    void set<%- camelize(property.name) %>Transition(const TransitionOptions&);
+    TransitionOptions get<%- camelize(property.name) %>Transition() const;
 
 <% } -%>
     // Private implementation
diff --git a/include/mbgl/style/layers/line_layer.hpp b/include/mbgl/style/layers/line_layer.hpp
index 6000839d1c..c643ad110d 100644
--- a/include/mbgl/style/layers/line_layer.hpp
+++ b/include/mbgl/style/layers/line_layer.hpp
@@ -57,64 +57,64 @@ public:
     // Paint properties
 
     static DataDrivenPropertyValue<float> getDefaultLineOpacity();
-    DataDrivenPropertyValue<float> getLineOpacity(const optional<std::string>& klass = {}) const;
-    void setLineOpacity(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
-    void setLineOpacityTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getLineOpacityTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<float> getLineOpacity() const;
+    void setLineOpacity(DataDrivenPropertyValue<float>);
+    void setLineOpacityTransition(const TransitionOptions&);
+    TransitionOptions getLineOpacityTransition() const;
 
     static DataDrivenPropertyValue<Color> getDefaultLineColor();
-    DataDrivenPropertyValue<Color> getLineColor(const optional<std::string>& klass = {}) const;
-    void setLineColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
-    void setLineColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getLineColorTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<Color> getLineColor() const;
+    void setLineColor(DataDrivenPropertyValue<Color>);
+    void setLineColorTransition(const TransitionOptions&);
+    TransitionOptions getLineColorTransition() const;
 
     static PropertyValue<std::array<float, 2>> getDefaultLineTranslate();
-    PropertyValue<std::array<float, 2>> getLineTranslate(const optional<std::string>& klass = {}) const;
-    void setLineTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {});
-    void setLineTranslateTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getLineTranslateTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<std::array<float, 2>> getLineTranslate() const;
+    void setLineTranslate(PropertyValue<std::array<float, 2>>);
+    void setLineTranslateTransition(const TransitionOptions&);
+    TransitionOptions getLineTranslateTransition() const;
 
     static PropertyValue<TranslateAnchorType> getDefaultLineTranslateAnchor();
-    PropertyValue<TranslateAnchorType> getLineTranslateAnchor(const optional<std::string>& klass = {}) const;
-    void setLineTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {});
-    void setLineTranslateAnchorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getLineTranslateAnchorTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<TranslateAnchorType> getLineTranslateAnchor() const;
+    void setLineTranslateAnchor(PropertyValue<TranslateAnchorType>);
+    void setLineTranslateAnchorTransition(const TransitionOptions&);
+    TransitionOptions getLineTranslateAnchorTransition() const;
 
     static PropertyValue<float> getDefaultLineWidth();
-    PropertyValue<float> getLineWidth(const optional<std::string>& klass = {}) const;
-    void setLineWidth(PropertyValue<float>, const optional<std::string>& klass = {});
-    void setLineWidthTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getLineWidthTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<float> getLineWidth() const;
+    void setLineWidth(PropertyValue<float>);
+    void setLineWidthTransition(const TransitionOptions&);
+    TransitionOptions getLineWidthTransition() const;
 
     static DataDrivenPropertyValue<float> getDefaultLineGapWidth();
-    DataDrivenPropertyValue<float> getLineGapWidth(const optional<std::string>& klass = {}) const;
-    void setLineGapWidth(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
-    void setLineGapWidthTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getLineGapWidthTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<float> getLineGapWidth() const;
+    void setLineGapWidth(DataDrivenPropertyValue<float>);
+    void setLineGapWidthTransition(const TransitionOptions&);
+    TransitionOptions getLineGapWidthTransition() const;
 
     static DataDrivenPropertyValue<float> getDefaultLineOffset();
-    DataDrivenPropertyValue<float> getLineOffset(const optional<std::string>& klass = {}) const;
-    void setLineOffset(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
-    void setLineOffsetTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getLineOffsetTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<float> getLineOffset() const;
+    void setLineOffset(DataDrivenPropertyValue<float>);
+    void setLineOffsetTransition(const TransitionOptions&);
+    TransitionOptions getLineOffsetTransition() const;
 
     static DataDrivenPropertyValue<float> getDefaultLineBlur();
-    DataDrivenPropertyValue<float> getLineBlur(const optional<std::string>& klass = {}) const;
-    void setLineBlur(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
-    void setLineBlurTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getLineBlurTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<float> getLineBlur() const;
+    void setLineBlur(DataDrivenPropertyValue<float>);
+    void setLineBlurTransition(const TransitionOptions&);
+    TransitionOptions getLineBlurTransition() const;
 
     static PropertyValue<std::vector<float>> getDefaultLineDasharray();
-    PropertyValue<std::vector<float>> getLineDasharray(const optional<std::string>& klass = {}) const;
-    void setLineDasharray(PropertyValue<std::vector<float>>, const optional<std::string>& klass = {});
-    void setLineDasharrayTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getLineDasharrayTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<std::vector<float>> getLineDasharray() const;
+    void setLineDasharray(PropertyValue<std::vector<float>>);
+    void setLineDasharrayTransition(const TransitionOptions&);
+    TransitionOptions getLineDasharrayTransition() const;
 
     static PropertyValue<std::string> getDefaultLinePattern();
-    PropertyValue<std::string> getLinePattern(const optional<std::string>& klass = {}) const;
-    void setLinePattern(PropertyValue<std::string>, const optional<std::string>& klass = {});
-    void setLinePatternTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getLinePatternTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<std::string> getLinePattern() const;
+    void setLinePattern(PropertyValue<std::string>);
+    void setLinePatternTransition(const TransitionOptions&);
+    TransitionOptions getLinePatternTransition() const;
 
     // Private implementation
 
diff --git a/include/mbgl/style/layers/raster_layer.hpp b/include/mbgl/style/layers/raster_layer.hpp
index ad9a68f1b0..8111364709 100644
--- a/include/mbgl/style/layers/raster_layer.hpp
+++ b/include/mbgl/style/layers/raster_layer.hpp
@@ -32,46 +32,46 @@ public:
     // Paint properties
 
     static PropertyValue<float> getDefaultRasterOpacity();
-    PropertyValue<float> getRasterOpacity(const optional<std::string>& klass = {}) const;
-    void setRasterOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
-    void setRasterOpacityTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getRasterOpacityTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<float> getRasterOpacity() const;
+    void setRasterOpacity(PropertyValue<float>);
+    void setRasterOpacityTransition(const TransitionOptions&);
+    TransitionOptions getRasterOpacityTransition() const;
 
     static PropertyValue<float> getDefaultRasterHueRotate();
-    PropertyValue<float> getRasterHueRotate(const optional<std::string>& klass = {}) const;
-    void setRasterHueRotate(PropertyValue<float>, const optional<std::string>& klass = {});
-    void setRasterHueRotateTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getRasterHueRotateTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<float> getRasterHueRotate() const;
+    void setRasterHueRotate(PropertyValue<float>);
+    void setRasterHueRotateTransition(const TransitionOptions&);
+    TransitionOptions getRasterHueRotateTransition() const;
 
     static PropertyValue<float> getDefaultRasterBrightnessMin();
-    PropertyValue<float> getRasterBrightnessMin(const optional<std::string>& klass = {}) const;
-    void setRasterBrightnessMin(PropertyValue<float>, const optional<std::string>& klass = {});
-    void setRasterBrightnessMinTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getRasterBrightnessMinTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<float> getRasterBrightnessMin() const;
+    void setRasterBrightnessMin(PropertyValue<float>);
+    void setRasterBrightnessMinTransition(const TransitionOptions&);
+    TransitionOptions getRasterBrightnessMinTransition() const;
 
     static PropertyValue<float> getDefaultRasterBrightnessMax();
-    PropertyValue<float> getRasterBrightnessMax(const optional<std::string>& klass = {}) const;
-    void setRasterBrightnessMax(PropertyValue<float>, const optional<std::string>& klass = {});
-    void setRasterBrightnessMaxTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getRasterBrightnessMaxTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<float> getRasterBrightnessMax() const;
+    void setRasterBrightnessMax(PropertyValue<float>);
+    void setRasterBrightnessMaxTransition(const TransitionOptions&);
+    TransitionOptions getRasterBrightnessMaxTransition() const;
 
     static PropertyValue<float> getDefaultRasterSaturation();
-    PropertyValue<float> getRasterSaturation(const optional<std::string>& klass = {}) const;
-    void setRasterSaturation(PropertyValue<float>, const optional<std::string>& klass = {});
-    void setRasterSaturationTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getRasterSaturationTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<float> getRasterSaturation() const;
+    void setRasterSaturation(PropertyValue<float>);
+    void setRasterSaturationTransition(const TransitionOptions&);
+    TransitionOptions getRasterSaturationTransition() const;
 
     static PropertyValue<float> getDefaultRasterContrast();
-    PropertyValue<float> getRasterContrast(const optional<std::string>& klass = {}) const;
-    void setRasterContrast(PropertyValue<float>, const optional<std::string>& klass = {});
-    void setRasterContrastTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getRasterContrastTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<float> getRasterContrast() const;
+    void setRasterContrast(PropertyValue<float>);
+    void setRasterContrastTransition(const TransitionOptions&);
+    TransitionOptions getRasterContrastTransition() const;
 
     static PropertyValue<float> getDefaultRasterFadeDuration();
-    PropertyValue<float> getRasterFadeDuration(const optional<std::string>& klass = {}) const;
-    void setRasterFadeDuration(PropertyValue<float>, const optional<std::string>& klass = {});
-    void setRasterFadeDurationTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getRasterFadeDurationTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<float> getRasterFadeDuration() const;
+    void setRasterFadeDuration(PropertyValue<float>);
+    void setRasterFadeDurationTransition(const TransitionOptions&);
+    TransitionOptions getRasterFadeDurationTransition() const;
 
     // Private implementation
 
diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp
index e7df5a92ae..8158f267c9 100644
--- a/include/mbgl/style/layers/symbol_layer.hpp
+++ b/include/mbgl/style/layers/symbol_layer.hpp
@@ -177,88 +177,88 @@ public:
     // Paint properties
 
     static DataDrivenPropertyValue<float> getDefaultIconOpacity();
-    DataDrivenPropertyValue<float> getIconOpacity(const optional<std::string>& klass = {}) const;
-    void setIconOpacity(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
-    void setIconOpacityTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getIconOpacityTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<float> getIconOpacity() const;
+    void setIconOpacity(DataDrivenPropertyValue<float>);
+    void setIconOpacityTransition(const TransitionOptions&);
+    TransitionOptions getIconOpacityTransition() const;
 
     static DataDrivenPropertyValue<Color> getDefaultIconColor();
-    DataDrivenPropertyValue<Color> getIconColor(const optional<std::string>& klass = {}) const;
-    void setIconColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
-    void setIconColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getIconColorTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<Color> getIconColor() const;
+    void setIconColor(DataDrivenPropertyValue<Color>);
+    void setIconColorTransition(const TransitionOptions&);
+    TransitionOptions getIconColorTransition() const;
 
     static DataDrivenPropertyValue<Color> getDefaultIconHaloColor();
-    DataDrivenPropertyValue<Color> getIconHaloColor(const optional<std::string>& klass = {}) const;
-    void setIconHaloColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
-    void setIconHaloColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getIconHaloColorTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<Color> getIconHaloColor() const;
+    void setIconHaloColor(DataDrivenPropertyValue<Color>);
+    void setIconHaloColorTransition(const TransitionOptions&);
+    TransitionOptions getIconHaloColorTransition() const;
 
     static DataDrivenPropertyValue<float> getDefaultIconHaloWidth();
-    DataDrivenPropertyValue<float> getIconHaloWidth(const optional<std::string>& klass = {}) const;
-    void setIconHaloWidth(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
-    void setIconHaloWidthTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getIconHaloWidthTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<float> getIconHaloWidth() const;
+    void setIconHaloWidth(DataDrivenPropertyValue<float>);
+    void setIconHaloWidthTransition(const TransitionOptions&);
+    TransitionOptions getIconHaloWidthTransition() const;
 
     static DataDrivenPropertyValue<float> getDefaultIconHaloBlur();
-    DataDrivenPropertyValue<float> getIconHaloBlur(const optional<std::string>& klass = {}) const;
-    void setIconHaloBlur(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
-    void setIconHaloBlurTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getIconHaloBlurTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<float> getIconHaloBlur() const;
+    void setIconHaloBlur(DataDrivenPropertyValue<float>);
+    void setIconHaloBlurTransition(const TransitionOptions&);
+    TransitionOptions getIconHaloBlurTransition() const;
 
     static PropertyValue<std::array<float, 2>> getDefaultIconTranslate();
-    PropertyValue<std::array<float, 2>> getIconTranslate(const optional<std::string>& klass = {}) const;
-    void setIconTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {});
-    void setIconTranslateTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getIconTranslateTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<std::array<float, 2>> getIconTranslate() const;
+    void setIconTranslate(PropertyValue<std::array<float, 2>>);
+    void setIconTranslateTransition(const TransitionOptions&);
+    TransitionOptions getIconTranslateTransition() const;
 
     static PropertyValue<TranslateAnchorType> getDefaultIconTranslateAnchor();
-    PropertyValue<TranslateAnchorType> getIconTranslateAnchor(const optional<std::string>& klass = {}) const;
-    void setIconTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {});
-    void setIconTranslateAnchorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getIconTranslateAnchorTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<TranslateAnchorType> getIconTranslateAnchor() const;
+    void setIconTranslateAnchor(PropertyValue<TranslateAnchorType>);
+    void setIconTranslateAnchorTransition(const TransitionOptions&);
+    TransitionOptions getIconTranslateAnchorTransition() const;
 
     static DataDrivenPropertyValue<float> getDefaultTextOpacity();
-    DataDrivenPropertyValue<float> getTextOpacity(const optional<std::string>& klass = {}) const;
-    void setTextOpacity(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
-    void setTextOpacityTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getTextOpacityTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<float> getTextOpacity() const;
+    void setTextOpacity(DataDrivenPropertyValue<float>);
+    void setTextOpacityTransition(const TransitionOptions&);
+    TransitionOptions getTextOpacityTransition() const;
 
     static DataDrivenPropertyValue<Color> getDefaultTextColor();
-    DataDrivenPropertyValue<Color> getTextColor(const optional<std::string>& klass = {}) const;
-    void setTextColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
-    void setTextColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getTextColorTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<Color> getTextColor() const;
+    void setTextColor(DataDrivenPropertyValue<Color>);
+    void setTextColorTransition(const TransitionOptions&);
+    TransitionOptions getTextColorTransition() const;
 
     static DataDrivenPropertyValue<Color> getDefaultTextHaloColor();
-    DataDrivenPropertyValue<Color> getTextHaloColor(const optional<std::string>& klass = {}) const;
-    void setTextHaloColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
-    void setTextHaloColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getTextHaloColorTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<Color> getTextHaloColor() const;
+    void setTextHaloColor(DataDrivenPropertyValue<Color>);
+    void setTextHaloColorTransition(const TransitionOptions&);
+    TransitionOptions getTextHaloColorTransition() const;
 
     static DataDrivenPropertyValue<float> getDefaultTextHaloWidth();
-    DataDrivenPropertyValue<float> getTextHaloWidth(const optional<std::string>& klass = {}) const;
-    void setTextHaloWidth(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
-    void setTextHaloWidthTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getTextHaloWidthTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<float> getTextHaloWidth() const;
+    void setTextHaloWidth(DataDrivenPropertyValue<float>);
+    void setTextHaloWidthTransition(const TransitionOptions&);
+    TransitionOptions getTextHaloWidthTransition() const;
 
     static DataDrivenPropertyValue<float> getDefaultTextHaloBlur();
-    DataDrivenPropertyValue<float> getTextHaloBlur(const optional<std::string>& klass = {}) const;
-    void setTextHaloBlur(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
-    void setTextHaloBlurTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getTextHaloBlurTransition(const optional<std::string>& klass = {}) const;
+    DataDrivenPropertyValue<float> getTextHaloBlur() const;
+    void setTextHaloBlur(DataDrivenPropertyValue<float>);
+    void setTextHaloBlurTransition(const TransitionOptions&);
+    TransitionOptions getTextHaloBlurTransition() const;
 
     static PropertyValue<std::array<float, 2>> getDefaultTextTranslate();
-    PropertyValue<std::array<float, 2>> getTextTranslate(const optional<std::string>& klass = {}) const;
-    void setTextTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {});
-    void setTextTranslateTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getTextTranslateTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<std::array<float, 2>> getTextTranslate() const;
+    void setTextTranslate(PropertyValue<std::array<float, 2>>);
+    void setTextTranslateTransition(const TransitionOptions&);
+    TransitionOptions getTextTranslateTransition() const;
 
     static PropertyValue<TranslateAnchorType> getDefaultTextTranslateAnchor();
-    PropertyValue<TranslateAnchorType> getTextTranslateAnchor(const optional<std::string>& klass = {}) const;
-    void setTextTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {});
-    void setTextTranslateAnchorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
-    TransitionOptions getTextTranslateAnchorTransition(const optional<std::string>& klass = {}) const;
+    PropertyValue<TranslateAnchorType> getTextTranslateAnchor() const;
+    void setTextTranslateAnchor(PropertyValue<TranslateAnchorType>);
+    void setTextTranslateAnchorTransition(const TransitionOptions&);
+    TransitionOptions getTextTranslateAnchorTransition() const;
 
     // Private implementation