diff --git a/servo/components/style/gecko/pseudo_element_definition.mako.rs b/servo/components/style/gecko/pseudo_element_definition.mako.rs
index 6143f14f1a034..cf15f4cb315ad 100644
--- a/servo/components/style/gecko/pseudo_element_definition.mako.rs
+++ b/servo/components/style/gecko/pseudo_element_definition.mako.rs
@@ -1055,10 +1055,15 @@ Option
 Self
 >
 {
-match_ignore_ascii_case
+ascii_case_insensitive_phf_map
 !
 {
-name
+pseudo
+-
+>
+PseudoElement
+=
+{
 %
 for
 pseudo
@@ -1079,17 +1084,11 @@ value
 =
 >
 {
-return
-Some
-(
-{
 pseudo_element_variant
 (
 pseudo
 )
 }
-)
-}
 %
 endfor
 /
@@ -1115,17 +1114,10 @@ selection
 "
 =
 >
-{
-return
-Some
-(
 PseudoElement
 :
 :
 Selection
-)
-;
-}
 "
 -
 moz
@@ -1134,17 +1126,10 @@ placeholder
 "
 =
 >
-{
-return
-Some
-(
 PseudoElement
 :
 :
 Placeholder
-)
-;
-}
 "
 -
 moz
@@ -1153,7 +1138,12 @@ list
 -
 bullet
 "
-|
+=
+>
+PseudoElement
+:
+:
+Marker
 "
 -
 moz
@@ -1164,21 +1154,38 @@ number
 "
 =
 >
-{
-return
-Some
-(
 PseudoElement
 :
 :
 Marker
-)
-;
 }
-_
+}
+if
+let
+Some
+(
+p
+)
 =
->
+pseudo
+:
+:
+get
+(
+name
+)
 {
+return
+Some
+(
+p
+.
+clone
+(
+)
+)
+;
+}
 if
 starts_with_ignore_ascii_case
 (
@@ -1264,8 +1271,6 @@ into
 )
 ;
 }
-}
-}
 None
 }
 #