From 0d0016932bda137666c5dc05332f7ba8539b9d0f Mon Sep 17 00:00:00 2001
From: Gavin Simpson <ucfagls@gmail.com>
Date: Sat, 19 Oct 2024 13:54:31 +0200
Subject: [PATCH] pkg updates have changed many vdiffr snapshots again

---
 .../_snaps/bam-ar/draw-bam-ar-1-factor-by.svg |  20 +-
 ...asis-works-with-a-gam-multiple-smooths.svg |  60 ++---
 ...aw-gam-user-select-and-parametric-true.svg |  20 +-
 .../compare-smooths-all-smooths.svg           | 109 +++------
 .../compare-smooths-bottom-legend.svg         | 109 +++------
 .../compare-smooths-set-nrow-ncol.svg         | 109 +++------
 ...e-47-derivatives-for-complex-factor-by.svg |  60 ++---
 ...raw-issue-47-derivatives-for-factor-by.svg |  40 ++--
 ...ssue-47-derivatives-for-gamm-factor-by.svg |  60 ++---
 ...-issue-47-derivs-for-ordered-factor-by.svg |  60 ++---
 .../appraise-diagnostic-plots.svg             |  60 ++---
 .../_snaps/diagnostic-plots/appraise-lm.svg   |  60 ++---
 .../diagnostic-plots/appraise-worm-plot.svg   |  60 ++---
 .../draw-difference-smooths-bam.svg           |  40 ++--
 ...aw-difference-smooths-gam-fixed-scales.svg |  40 ++--
 ...w-difference-smooths-gam-inc-grp-means.svg |  40 ++--
 .../draw-difference-smooths-gam-ref-line.svg  |  40 ++--
 .../draw-difference-smooths-gam-user-data.svg |  40 ++--
 .../draw-difference-smooths-gam.svg           |  40 ++--
 .../draw-difference-smooths-gamm.svg          |  40 ++--
 .../draw-difference-smooths-gamm4.svg         |  40 ++--
 .../draw-gam/draw-gam-m-2-fac-parametric.svg  |  80 +++----
 .../_snaps/draw-gam/draw-gam-m-2-fac.svg      |  40 ++--
 .../_snaps/draw-gam/draw-gam-m-ar1-by.svg     |  20 +-
 .../_snaps/draw-gam/draw-gam-m-bam.svg        |  60 ++---
 .../draw-gam/draw-gam-m-gam-constant-fun.svg  |  60 ++---
 .../draw-gam/draw-gam-m-gam-constant.svg      |  60 ++---
 .../_snaps/draw-gam/draw-gam-m-gam-fun.svg    |  60 ++---
 .../draw-gam/draw-gam-m-gam-rotated.svg       |  60 ++---
 .../_snaps/draw-gam/draw-gam-m-gam.svg        |  60 ++---
 .../_snaps/draw-gam/draw-gam-m-gamgcv.svg     |  60 ++---
 .../_snaps/draw-gam/draw-gam-m-gamm.svg       |  60 ++---
 .../_snaps/draw-gam/draw-gam-m-gamm4.svg      |  60 ++---
 .../_snaps/draw-gam/draw-gam-m-gaulss.svg     |  60 ++---
 .../draw-gam-m-para-sm-parametric.svg         |  80 +++----
 .../_snaps/draw-gam/draw-gam-m-para-sm.svg    |  20 +-
 .../_snaps/draw-gam/draw-gam-m-scat.svg       |  60 ++---
 ...m-parametric-only-model-rotated-labels.svg |  80 +++----
 .../testthat/_snaps/draw-gam/draw-gam-rm1.svg |  80 +++----
 .../testthat/_snaps/draw-gam/draw-gam-rm2.svg | 100 ++++----
 .../_snaps/draw-gam/grouped-by-gam.svg        |  20 +-
 .../draw-gam/ordered-grouped-by-gam.svg       |  20 +-
 ...draw-am-with-factor-by-variable-smooth.svg |  60 ++---
 .../draw-methods/draw-by-factor-basis.svg     |  40 ++--
 ...w-derivatives-for-a-gam-rotated-labels.svg |  60 ++---
 ...ivatives-for-a-gam-with-default-change.svg |  60 ++---
 ...es-for-a-gam-with-fixed-scales-rotated.svg |  60 ++---
 ...erivatives-for-a-gam-with-fixed-scales.svg |  60 ++---
 ...erivatives-for-a-gam-with-sizer-change.svg |  60 ++---
 .../draw-derivatives-for-a-gam.svg            |  60 ++---
 ...r-by-variable-smooth-with-fixed-scales.svg |  60 ++---
 ...fs-smooth-with-discrete-plasma-palette.svg |  40 ++--
 .../draw-gam-model-with-fs-smooth.svg         |  40 ++--
 ...-gam-model-with-ranef-smooth-factor-by.svg | 100 ++++----
 .../draw-gam-model-with-ranef-smooth.svg      |  80 +++----
 ...oth-for-two-selected-smooths-character.svg |  20 +-
 ...mooth-for-two-selected-smooths-logical.svg |  20 +-
 ...mooth-for-two-selected-smooths-numeric.svg |  20 +-
 .../draw-gam-with-factor-parametric-term.svg  |  40 ++--
 .../draw-gam-with-linear-parametric-term.svg  |  40 ++--
 ...raw-gam-with-overall-uncertainty-false.svg |  60 ++---
 .../draw-gam-with-partial-match-true.svg      |  40 ++--
 ...am-with-select-and-parametric-is-false.svg |  40 ++--
 ...gam-with-select-and-parametric-is-null.svg |  40 ++--
 ...gam-with-select-and-parametric-is-true.svg |  60 ++---
 ...without-select-and-parametric-is-false.svg |  60 ++---
 ...-without-select-and-parametric-is-true.svg |  80 +++----
 .../draw-issue-39-empty-plots.svg             |  40 ++--
 ...draw-model-with-fs-smooth-fixed-scales.svg |  40 ++--
 ...w-model-with-ranef-smooth-fixed-scales.svg |  80 +++----
 ...ed-factor-by-smooth-samples-for-gam-m3.svg |  40 ++--
 ...mple-multi-smooth-am-with-fixed-scales.svg |  60 ++---
 .../draw-simple-multi-smooth-am.svg           |  60 ++---
 ...le-partial-residuals-with-fixed-scales.svg |  60 ++---
 .../draw-simple-partial-residuals.svg         |  60 ++---
 ...draw-smooth-samples-for-gam-m1-rotated.svg |  60 ++---
 .../draw-smooth-samples-for-gam-m1.svg        |  60 ++---
 ...amples-for-gam-m3-fixed-scales-rotated.svg |  60 ++---
 ...smooth-samples-for-gam-m3-fixed-scales.svg |  60 ++---
 ...draw-smooth-samples-for-gam-m3-rotated.svg |  60 ++---
 .../draw-smooth-samples-for-gam-m3.svg        |  60 ++---
 .../draw-smooth-samples-for-gam-n-samples.svg |  60 ++---
 .../draw-smooth-samples-for-m1-n-samples.svg  |  60 ++---
 ...th-ranef-smooth-factor-by-fixed-scales.svg | 100 ++++----
 .../draw-ziplss-parametric-terms-issue-45.svg |  20 +-
 ...aw-uses-fixed-scales-if-asked-for-them.svg |  40 ++--
 .../draw-parametric-effects-m-2-fac.svg       |  20 +-
 .../draw-parametric-effects-m-only-para.svg   |  80 +++----
 .../draw-parametric-effects-m-para-sm.svg     |  40 ++--
 .../issue-219-parametric-effects.svg          |  40 ++--
 ...iplss-with-both-parametric-not-plotted.svg |  20 +-
 .../ziplss-with-both-parametric-plotted.svg   |  80 +++----
 .../ziplss-with-factor-para-not-plotted.svg   |  20 +-
 .../ziplss-with-factor-para-plotted.svg       |  60 ++---
 .../ziplss-with-numeric-para-not-plotted.svg  |  20 +-
 .../ziplss-with-numeric-para-plotted.svg      |  60 ++---
 .../draw-sm-est-grouped-by-true-ordered.svg   |  20 +-
 .../draw-sm-est-grouped-by-true.svg           |  20 +-
 ...mooth-est-works-with-change-indicators.svg |  60 ++---
 ...smooth-est-works-with-sizer-indicators.svg |  60 ++---
 ...draw-smooth-estimates-sz-factor-smooth.svg |  40 ++--
 ...-smooth-estimates-sz-two-factor-smooth.svg |  60 ++---
 .../draw-subtitle-ordered-by-smooths.svg      | 220 +++++++++---------
 .../gjrm-methods/draw-simple-gjrm-gamlss.svg  |  40 ++--
 .../parametric-effects/testing-issue-212.svg  |  80 +++----
 .../draw-penalty-df-as-matrix-false.svg       |  60 ++---
 .../draw-penalty-df-as-matrix-true.svg        |  60 ++---
 .../draw-penalty-df-issue-95-label-order.svg  |  60 ++---
 ...ty-df-with-multiple-smooths-normalized.svg |  60 ++---
 .../draw-penalty-df-with-multiple-smooths.svg |  60 ++---
 ...-multiple-smooths-user-continuous-fill.svg |  60 ++---
 111 files changed, 2990 insertions(+), 3137 deletions(-)

diff --git a/tests/testthat/_snaps/bam-ar/draw-bam-ar-1-factor-by.svg b/tests/testthat/_snaps/bam-ar/draw-bam-ar-1-factor-by.svg
index 581be4364..04ced9d1e 100644
--- a/tests/testthat/_snaps/bam-ar/draw-bam-ar-1-factor-by.svg
+++ b/tests/testthat/_snaps/bam-ar/draw-bam-ar-1-factor-by.svg
@@ -39,6 +39,16 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI='>
+    <rect x='360.00' y='22.78' width='354.52' height='547.74' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI=)'>
+<rect x='360.00' y='22.78' width='354.52' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDYwLjkwfDUyNi4yNw=='>
     <rect x='36.31' y='60.90' width='318.21' height='465.37' />
@@ -90,16 +100,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='22.00px' lengthAdjust='spacingAndGlyphs'>s(x)</text>
 <text x='354.52' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI='>
-    <rect x='360.00' y='22.78' width='354.52' height='547.74' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI=)'>
-<rect x='360.00' y='22.78' width='354.52' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkwLjgzfDcwOS4wNHw2MC45MHw1MjYuMjc='>
     <rect x='390.83' y='60.90' width='318.21' height='465.37' />
diff --git a/tests/testthat/_snaps/basis/draw-basis-works-with-a-gam-multiple-smooths.svg b/tests/testthat/_snaps/basis/draw-basis-works-with-a-gam-multiple-smooths.svg
index 07b9a198d..aad4aaa44 100644
--- a/tests/testthat/_snaps/basis/draw-basis-works-with-a-gam-multiple-smooths.svg
+++ b/tests/testthat/_snaps/basis/draw-basis-works-with-a-gam-multiple-smooths.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzUwLjg1fDQ1LjU3fDI2NS43Ng=='>
     <rect x='41.20' y='45.57' width='309.65' height='220.20' />
@@ -97,16 +127,6 @@
 <text transform='translate(18.53,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='28.14px' lengthAdjust='spacingAndGlyphs'>Value</text>
 <text x='41.20' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk5LjM5fDcwOS4wNHw0NS41N3wyNjUuNzY='>
     <rect x='399.39' y='45.57' width='309.65' height='220.20' />
@@ -161,16 +181,6 @@
 <text transform='translate(369.38,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='28.14px' lengthAdjust='spacingAndGlyphs'>Value</text>
 <text x='399.39' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzUwLjg1fDMxOS40NHw1MzkuNjM='>
     <rect x='41.20' y='319.44' width='309.65' height='220.20' />
@@ -228,16 +238,6 @@
 <text transform='translate(18.53,429.53) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='28.14px' lengthAdjust='spacingAndGlyphs'>Value</text>
 <text x='41.20' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk5LjM5fDcwOS4wNHwzMTkuNDR8NTM5LjYz'>
     <rect x='399.39' y='319.44' width='309.65' height='220.20' />
diff --git a/tests/testthat/_snaps/by-variables/draw-gam-user-select-and-parametric-true.svg b/tests/testthat/_snaps/by-variables/draw-gam-user-select-and-parametric-true.svg
index dfb062bea..0ca5c707b 100644
--- a/tests/testthat/_snaps/by-variables/draw-gam-user-select-and-parametric-true.svg
+++ b/tests/testthat/_snaps/by-variables/draw-gam-user-select-and-parametric-true.svg
@@ -39,6 +39,16 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI='>
+    <rect x='360.00' y='22.78' width='354.52' height='547.74' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI=)'>
+<rect x='360.00' y='22.78' width='354.52' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDYwLjkwfDUyNi4yNw=='>
     <rect x='36.31' y='60.90' width='318.21' height='465.37' />
@@ -234,16 +244,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='354.52' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI='>
-    <rect x='360.00' y='22.78' width='354.52' height='547.74' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI=)'>
-<rect x='360.00' y='22.78' width='354.52' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkwLjgzfDcwOS4wNHw2MC45MHw1MjYuMjc='>
     <rect x='390.83' y='60.90' width='318.21' height='465.37' />
diff --git a/tests/testthat/_snaps/compare-smooths/compare-smooths-all-smooths.svg b/tests/testthat/_snaps/compare-smooths/compare-smooths-all-smooths.svg
index 687239faf..d1c040695 100644
--- a/tests/testthat/_snaps/compare-smooths/compare-smooths-all-smooths.svg
+++ b/tests/testthat/_snaps/compare-smooths/compare-smooths-all-smooths.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMjg2LjUzfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='286.53' y='22.78' width='427.99' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjg2LjUzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='286.53' y='22.78' width='427.99' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwyODYuNTN8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='281.05' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwyODYuNTN8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='281.05' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMjg2LjUzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='286.53' y='296.65' width='427.99' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjg2LjUzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='286.53' y='296.65' width='427.99' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MjgxLjA1fDQ1LjU3fDI2NS43Ng=='>
     <rect x='36.31' y='45.57' width='244.74' height='220.20' />
@@ -96,16 +126,6 @@
 <text transform='translate(18.53,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='42.80px' lengthAdjust='spacingAndGlyphs'>Estimate</text>
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 </g>
-<defs>
-  <clipPath id='cpMjg2LjUzfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='286.53' y='22.78' width='427.99' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjg2LjUzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='286.53' y='22.78' width='427.99' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzI0LjcwfDU2OS40NHw0NS41N3wyNjUuNzY='>
     <rect x='324.70' y='45.57' width='244.74' height='220.20' />
@@ -162,16 +182,6 @@
 <text transform='translate(299.58,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='42.80px' lengthAdjust='spacingAndGlyphs'>Estimate</text>
 <text x='324.70' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwyODYuNTN8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='281.05' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwyODYuNTN8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='281.05' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MjgxLjA1fDMxOS40NHw1MzkuNjM='>
     <rect x='36.31' y='319.44' width='244.74' height='220.20' />
@@ -225,16 +235,6 @@
 <text transform='translate(18.53,429.53) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='42.80px' lengthAdjust='spacingAndGlyphs'>Estimate</text>
 <text x='36.31' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMjg2LjUzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='286.53' y='296.65' width='427.99' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjg2LjUzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='286.53' y='296.65' width='427.99' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzI0LjcwfDU2OS40NHwzMTkuNDR8NTM5LjYz'>
     <rect x='324.70' y='319.44' width='244.74' height='220.20' />
@@ -293,65 +293,16 @@
 <text x='447.07' y='562.76' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='11.62px' lengthAdjust='spacingAndGlyphs'>x3</text>
 <text transform='translate(299.58,429.53) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='42.80px' lengthAdjust='spacingAndGlyphs'>Estimate</text>
 <text x='324.70' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x3)</text>
-</g>
-<defs>
-  <clipPath id='cpNTgwLjQwfDcwOS4wNHwyNjIuMTd8MzIzLjAz'>
-    <rect x='580.40' y='262.17' width='128.64' height='60.85' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNTgwLjQwfDcwOS4wNHwyNjIuMTd8MzIzLjAz)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <rect x='580.40' y='262.17' width='128.64' height='60.85' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpNTgwLjQwfDcwOS4wNHwyNjIuMTd8MzIzLjAz)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <text x='585.88' y='276.37' style='font-size: 11.00px; font-family: sans;' textLength='29.96px' lengthAdjust='spacingAndGlyphs'>Model</text>
-</g>
-<g clip-path='url(#cpNTgwLjQwfDcwOS4wNHwyNjIuMTd8MzIzLjAz)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <rect x='585.88' y='282.99' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #EBEBEB;' />
-</g>
-<g clip-path='url(#cpNTgwLjQwfDcwOS4wNHwyNjIuMTd8MzIzLjAz)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <rect x='586.59' y='283.70' width='15.86' height='15.86' style='stroke-width: 1.07; stroke: none; stroke-linecap: butt; stroke-linejoin: miter; fill: #F8766D; fill-opacity: 0.20;' />
-</g>
-<g clip-path='url(#cpNTgwLjQwfDcwOS4wNHwyNjIuMTd8MzIzLjAz)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <line x1='587.61' y1='291.63' x2='601.43' y2='291.63' style='stroke-width: 1.07; stroke: #F8766D; stroke-linecap: butt;' />
-</g>
-<g clip-path='url(#cpNTgwLjQwfDcwOS4wNHwyNjIuMTd8MzIzLjAz)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <rect x='585.88' y='300.27' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #EBEBEB;' />
-</g>
-<g clip-path='url(#cpNTgwLjQwfDcwOS4wNHwyNjIuMTd8MzIzLjAz)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <rect x='586.59' y='300.98' width='15.86' height='15.86' style='stroke-width: 1.07; stroke: none; stroke-linecap: butt; stroke-linejoin: miter; fill: #00BFC4; fill-opacity: 0.20;' />
-</g>
-<g clip-path='url(#cpNTgwLjQwfDcwOS4wNHwyNjIuMTd8MzIzLjAz)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <line x1='587.61' y1='308.91' x2='601.43' y2='308.91' style='stroke-width: 1.07; stroke: #00BFC4; stroke-linecap: butt;' />
-</g>
-<g clip-path='url(#cpNTgwLjQwfDcwOS4wNHwyNjIuMTd8MzIzLjAz)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <text x='608.64' y='294.65' style='font-size: 8.80px; font-family: sans;' textLength='66.55px' lengthAdjust='spacingAndGlyphs'>su_m_quick_eg1</text>
-</g>
-<g clip-path='url(#cpNTgwLjQwfDcwOS4wNHwyNjIuMTd8MzIzLjAz)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <text x='608.64' y='311.93' style='font-size: 8.80px; font-family: sans;' textLength='94.92px' lengthAdjust='spacingAndGlyphs'>su_m_quick_eg1_shrink</text>
-</g>
-<g clip-path='url(#cpNTgwLjQwfDcwOS4wNHwyNjIuMTd8MzIzLjAz)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <text x='10.96' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='183.44px' lengthAdjust='spacingAndGlyphs'>compare smooths - all smooths</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/compare-smooths/compare-smooths-bottom-legend.svg b/tests/testthat/_snaps/compare-smooths/compare-smooths-bottom-legend.svg
index 267ca998d..c88cb7e5d 100644
--- a/tests/testthat/_snaps/compare-smooths/compare-smooths-bottom-legend.svg
+++ b/tests/testthat/_snaps/compare-smooths/compare-smooths-bottom-legend.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyNzcuMDU='>
+    <rect x='356.33' y='22.78' width='358.19' height='254.27' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyNzcuMDU=)'>
+<rect x='356.33' y='22.78' width='358.19' height='254.27' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTYuMzN8Mjc3LjA1fDU3MC41Mg=='>
+    <rect x='5.48' y='277.05' width='350.85' height='293.47' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjc3LjA1fDU3MC41Mg==)'>
+<rect x='5.48' y='277.05' width='350.85' height='293.47' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyNzcuMDV8NTcwLjUy'>
+    <rect x='356.33' y='277.05' width='358.19' height='293.47' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyNzcuMDV8NTcwLjUy)'>
+<rect x='356.33' y='277.05' width='358.19' height='293.47' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDQ1LjU3fDI0Ni4xNw=='>
     <rect x='36.31' y='45.57' width='314.54' height='200.60' />
@@ -96,16 +126,6 @@
 <text transform='translate(18.53,145.87) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='42.80px' lengthAdjust='spacingAndGlyphs'>Estimate</text>
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyNzcuMDU='>
-    <rect x='356.33' y='22.78' width='358.19' height='254.27' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyNzcuMDU=)'>
-<rect x='356.33' y='22.78' width='358.19' height='254.27' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHw0NS41N3wyNDYuMTc='>
     <rect x='394.50' y='45.57' width='314.54' height='200.60' />
@@ -162,16 +182,6 @@
 <text transform='translate(369.38,145.87) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='42.80px' lengthAdjust='spacingAndGlyphs'>Estimate</text>
 <text x='394.50' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTYuMzN8Mjc3LjA1fDU3MC41Mg=='>
-    <rect x='5.48' y='277.05' width='350.85' height='293.47' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjc3LjA1fDU3MC41Mg==)'>
-<rect x='5.48' y='277.05' width='350.85' height='293.47' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDI5OS44NHw1MDAuNDQ='>
     <rect x='36.31' y='299.84' width='314.54' height='200.60' />
@@ -225,16 +235,6 @@
 <text transform='translate(18.53,400.14) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='42.80px' lengthAdjust='spacingAndGlyphs'>Estimate</text>
 <text x='36.31' y='291.62' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyNzcuMDV8NTcwLjUy'>
-    <rect x='356.33' y='277.05' width='358.19' height='293.47' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyNzcuMDV8NTcwLjUy)'>
-<rect x='356.33' y='277.05' width='358.19' height='293.47' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHwyOTkuODR8NTAwLjQ0'>
     <rect x='394.50' y='299.84' width='314.54' height='200.60' />
@@ -293,65 +293,16 @@
 <text x='551.77' y='523.56' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='11.62px' lengthAdjust='spacingAndGlyphs'>x3</text>
 <text transform='translate(369.38,400.14) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='42.80px' lengthAdjust='spacingAndGlyphs'>Estimate</text>
 <text x='394.50' y='291.62' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x3)</text>
-</g>
-<defs>
-  <clipPath id='cpMjQzLjI0fDUwMi4xMXw1MzYuODB8NTY1LjA0'>
-    <rect x='243.24' y='536.80' width='258.87' height='28.24' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQzLjI0fDUwMi4xMXw1MzYuODB8NTY1LjA0)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <rect x='243.24' y='536.80' width='258.87' height='28.24' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMjQzLjI0fDUwMi4xMXw1MzYuODB8NTY1LjA0)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <text x='248.72' y='554.71' style='font-size: 11.00px; font-family: sans;' textLength='29.96px' lengthAdjust='spacingAndGlyphs'>Model</text>
-</g>
-<g clip-path='url(#cpMjQzLjI0fDUwMi4xMXw1MzYuODB8NTY1LjA0)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <rect x='284.16' y='542.28' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #EBEBEB;' />
-</g>
-<g clip-path='url(#cpMjQzLjI0fDUwMi4xMXw1MzYuODB8NTY1LjA0)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <rect x='284.87' y='542.99' width='15.86' height='15.86' style='stroke-width: 1.07; stroke: none; stroke-linecap: butt; stroke-linejoin: miter; fill: #F8766D; fill-opacity: 0.20;' />
-</g>
-<g clip-path='url(#cpMjQzLjI0fDUwMi4xMXw1MzYuODB8NTY1LjA0)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <line x1='285.89' y1='550.92' x2='299.71' y2='550.92' style='stroke-width: 1.07; stroke: #F8766D; stroke-linecap: butt;' />
-</g>
-<g clip-path='url(#cpMjQzLjI0fDUwMi4xMXw1MzYuODB8NTY1LjA0)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <rect x='378.95' y='542.28' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #EBEBEB;' />
-</g>
-<g clip-path='url(#cpMjQzLjI0fDUwMi4xMXw1MzYuODB8NTY1LjA0)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <rect x='379.66' y='542.99' width='15.86' height='15.86' style='stroke-width: 1.07; stroke: none; stroke-linecap: butt; stroke-linejoin: miter; fill: #00BFC4; fill-opacity: 0.20;' />
-</g>
-<g clip-path='url(#cpMjQzLjI0fDUwMi4xMXw1MzYuODB8NTY1LjA0)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <line x1='380.68' y1='550.92' x2='394.50' y2='550.92' style='stroke-width: 1.07; stroke: #00BFC4; stroke-linecap: butt;' />
-</g>
-<g clip-path='url(#cpMjQzLjI0fDUwMi4xMXw1MzYuODB8NTY1LjA0)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <text x='306.92' y='553.95' style='font-size: 8.80px; font-family: sans;' textLength='66.55px' lengthAdjust='spacingAndGlyphs'>su_m_quick_eg1</text>
-</g>
-<g clip-path='url(#cpMjQzLjI0fDUwMi4xMXw1MzYuODB8NTY1LjA0)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <text x='401.71' y='553.95' style='font-size: 8.80px; font-family: sans;' textLength='94.92px' lengthAdjust='spacingAndGlyphs'>su_m_quick_eg1_shrink</text>
-</g>
-<g clip-path='url(#cpMjQzLjI0fDUwMi4xMXw1MzYuODB8NTY1LjA0)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <text x='10.96' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='200.34px' lengthAdjust='spacingAndGlyphs'>compare smooths - bottom legend</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/compare-smooths/compare-smooths-set-nrow-ncol.svg b/tests/testthat/_snaps/compare-smooths/compare-smooths-set-nrow-ncol.svg
index e6ce0a287..b13836ba2 100644
--- a/tests/testthat/_snaps/compare-smooths/compare-smooths-set-nrow-ncol.svg
+++ b/tests/testthat/_snaps/compare-smooths/compare-smooths-set-nrow-ncol.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMjAwLjE5fDM4Ny41NXwyMi43OHwyOTYuNjU='>
+    <rect x='200.19' y='22.78' width='187.37' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjAwLjE5fDM4Ny41NXwyMi43OHwyOTYuNjU=)'>
+<rect x='200.19' y='22.78' width='187.37' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzg3LjU1fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='387.55' y='22.78' width='326.97' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzg3LjU1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='387.55' y='22.78' width='326.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwyMDAuMTl8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='194.71' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwyMDAuMTl8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='194.71' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MTk0LjcxfDQ1LjU3fDI2NS43Ng=='>
     <rect x='43.65' y='45.57' width='151.06' height='220.20' />
@@ -96,16 +126,6 @@
 <text transform='translate(18.53,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='42.80px' lengthAdjust='spacingAndGlyphs'>Estimate</text>
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 </g>
-<defs>
-  <clipPath id='cpMjAwLjE5fDM4Ny41NXwyMi43OHwyOTYuNjU='>
-    <rect x='200.19' y='22.78' width='187.37' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjAwLjE5fDM4Ny41NXwyMi43OHwyOTYuNjU=)'>
-<rect x='200.19' y='22.78' width='187.37' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjMxLjAyfDM4Mi4wN3w0NS41N3wyNjUuNzY='>
     <rect x='231.02' y='45.57' width='151.06' height='220.20' />
@@ -162,16 +182,6 @@
 <text transform='translate(213.24,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='42.80px' lengthAdjust='spacingAndGlyphs'>Estimate</text>
 <text x='231.02' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 </g>
-<defs>
-  <clipPath id='cpMzg3LjU1fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='387.55' y='22.78' width='326.97' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzg3LjU1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='387.55' y='22.78' width='326.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDE4LjM4fDU2OS40NHw0NS41N3wyNjUuNzY='>
     <rect x='418.38' y='45.57' width='151.06' height='220.20' />
@@ -225,16 +235,6 @@
 <text transform='translate(400.60,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='42.80px' lengthAdjust='spacingAndGlyphs'>Estimate</text>
 <text x='418.38' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwyMDAuMTl8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='194.71' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwyMDAuMTl8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='194.71' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MTk0LjcxfDMxOS40NHw1MzkuNjM='>
     <rect x='43.65' y='319.44' width='151.06' height='220.20' />
@@ -293,65 +293,16 @@
 <text x='119.18' y='562.76' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='11.62px' lengthAdjust='spacingAndGlyphs'>x3</text>
 <text transform='translate(18.53,429.53) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='42.80px' lengthAdjust='spacingAndGlyphs'>Estimate</text>
 <text x='43.65' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x3)</text>
-</g>
-<defs>
-  <clipPath id='cpNTgwLjQwfDcwOS4wNHwyNjIuMTd8MzIzLjAz'>
-    <rect x='580.40' y='262.17' width='128.64' height='60.85' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNTgwLjQwfDcwOS4wNHwyNjIuMTd8MzIzLjAz)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <rect x='580.40' y='262.17' width='128.64' height='60.85' style='stroke-width: 1.07; stroke: none; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpNTgwLjQwfDcwOS4wNHwyNjIuMTd8MzIzLjAz)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <text x='585.88' y='276.37' style='font-size: 11.00px; font-family: sans;' textLength='29.96px' lengthAdjust='spacingAndGlyphs'>Model</text>
-</g>
-<g clip-path='url(#cpNTgwLjQwfDcwOS4wNHwyNjIuMTd8MzIzLjAz)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <rect x='585.88' y='282.99' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #EBEBEB;' />
-</g>
-<g clip-path='url(#cpNTgwLjQwfDcwOS4wNHwyNjIuMTd8MzIzLjAz)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <rect x='586.59' y='283.70' width='15.86' height='15.86' style='stroke-width: 1.07; stroke: none; stroke-linecap: butt; stroke-linejoin: miter; fill: #F8766D; fill-opacity: 0.20;' />
-</g>
-<g clip-path='url(#cpNTgwLjQwfDcwOS4wNHwyNjIuMTd8MzIzLjAz)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <line x1='587.61' y1='291.63' x2='601.43' y2='291.63' style='stroke-width: 1.07; stroke: #F8766D; stroke-linecap: butt;' />
-</g>
-<g clip-path='url(#cpNTgwLjQwfDcwOS4wNHwyNjIuMTd8MzIzLjAz)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <rect x='585.88' y='300.27' width='17.28' height='17.28' style='stroke-width: 1.07; stroke: none; fill: #EBEBEB;' />
-</g>
-<g clip-path='url(#cpNTgwLjQwfDcwOS4wNHwyNjIuMTd8MzIzLjAz)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <rect x='586.59' y='300.98' width='15.86' height='15.86' style='stroke-width: 1.07; stroke: none; stroke-linecap: butt; stroke-linejoin: miter; fill: #00BFC4; fill-opacity: 0.20;' />
-</g>
-<g clip-path='url(#cpNTgwLjQwfDcwOS4wNHwyNjIuMTd8MzIzLjAz)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <line x1='587.61' y1='308.91' x2='601.43' y2='308.91' style='stroke-width: 1.07; stroke: #00BFC4; stroke-linecap: butt;' />
-</g>
-<g clip-path='url(#cpNTgwLjQwfDcwOS4wNHwyNjIuMTd8MzIzLjAz)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <text x='608.64' y='294.65' style='font-size: 8.80px; font-family: sans;' textLength='66.55px' lengthAdjust='spacingAndGlyphs'>su_m_quick_eg1</text>
-</g>
-<g clip-path='url(#cpNTgwLjQwfDcwOS4wNHwyNjIuMTd8MzIzLjAz)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <text x='608.64' y='311.93' style='font-size: 8.80px; font-family: sans;' textLength='94.92px' lengthAdjust='spacingAndGlyphs'>su_m_quick_eg1_shrink</text>
-</g>
-<g clip-path='url(#cpNTgwLjQwfDcwOS4wNHwyNjIuMTd8MzIzLjAz)'>
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <text x='10.96' y='14.56' style='font-size: 13.20px; font-family: sans;' textLength='194.45px' lengthAdjust='spacingAndGlyphs'>compare smooths - set nrow ncol</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/derivatives/draw-issue-47-derivatives-for-complex-factor-by.svg b/tests/testthat/_snaps/derivatives/draw-issue-47-derivatives-for-complex-factor-by.svg
index ecff388ab..cc2617e99 100644
--- a/tests/testthat/_snaps/derivatives/draw-issue-47-derivatives-for-complex-factor-by.svg
+++ b/tests/testthat/_snaps/derivatives/draw-issue-47-derivatives-for-complex-factor-by.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='362.45' y='22.78' width='352.07' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='362.45' y='22.78' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='356.97' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='362.45' y='296.65' width='352.07' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='362.45' y='296.65' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzU2Ljk3fDQ1LjU3fDI2NS43Ng=='>
     <rect x='41.20' y='45.57' width='315.76' height='220.20' />
@@ -96,16 +126,6 @@
 <text transform='translate(18.53,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='41.20' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='362.45' y='22.78' width='352.07' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='362.45' y='22.78' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkzLjI4fDcwOS4wNHw0NS41N3wyNjUuNzY='>
     <rect x='393.28' y='45.57' width='315.76' height='220.20' />
@@ -154,16 +174,6 @@
 <text transform='translate(375.50,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='393.28' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='57.97px' lengthAdjust='spacingAndGlyphs'>s(x0):fac1</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='356.97' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzU2Ljk3fDMxOS40NHw1MzkuNjM='>
     <rect x='41.20' y='319.44' width='315.76' height='220.20' />
@@ -216,16 +226,6 @@
 <text transform='translate(18.53,429.53) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='41.20' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='57.97px' lengthAdjust='spacingAndGlyphs'>s(x0):fac2</text>
 </g>
-<defs>
-  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='362.45' y='296.65' width='352.07' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='362.45' y='296.65' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkzLjI4fDcwOS4wNHwzMTkuNDR8NTM5LjYz'>
     <rect x='393.28' y='319.44' width='315.76' height='220.20' />
diff --git a/tests/testthat/_snaps/derivatives/draw-issue-47-derivatives-for-factor-by.svg b/tests/testthat/_snaps/derivatives/draw-issue-47-derivatives-for-factor-by.svg
index 4dc996fb3..d65b60b46 100644
--- a/tests/testthat/_snaps/derivatives/draw-issue-47-derivatives-for-factor-by.svg
+++ b/tests/testthat/_snaps/derivatives/draw-issue-47-derivatives-for-factor-by.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYxLjQ3fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='361.47' y='22.78' width='353.06' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYxLjQ3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='361.47' y='22.78' width='353.06' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjEuNDd8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='355.99' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjEuNDd8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='355.99' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzU1Ljk5fDQ1LjU3fDI2NS43Ng=='>
     <rect x='41.20' y='45.57' width='314.78' height='220.20' />
@@ -87,16 +107,6 @@
 <text transform='translate(18.53,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='41.20' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='57.97px' lengthAdjust='spacingAndGlyphs'>s(x2):fac1</text>
 </g>
-<defs>
-  <clipPath id='cpMzYxLjQ3fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='361.47' y='22.78' width='353.06' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYxLjQ3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='361.47' y='22.78' width='353.06' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjI2fDcwOS4wNHw0NS41N3wyNjUuNzY='>
     <rect x='394.26' y='45.57' width='314.78' height='220.20' />
@@ -146,16 +156,6 @@
 <text transform='translate(374.51,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='394.26' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='57.97px' lengthAdjust='spacingAndGlyphs'>s(x2):fac2</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjEuNDd8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='355.99' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjEuNDd8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='355.99' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzU1Ljk5fDMxOS40NHw1MzkuNjM='>
     <rect x='41.20' y='319.44' width='314.78' height='220.20' />
diff --git a/tests/testthat/_snaps/derivatives/draw-issue-47-derivatives-for-gamm-factor-by.svg b/tests/testthat/_snaps/derivatives/draw-issue-47-derivatives-for-gamm-factor-by.svg
index 9c68ddd3f..9db0bb87e 100644
--- a/tests/testthat/_snaps/derivatives/draw-issue-47-derivatives-for-gamm-factor-by.svg
+++ b/tests/testthat/_snaps/derivatives/draw-issue-47-derivatives-for-gamm-factor-by.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='362.45' y='22.78' width='352.07' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='362.45' y='22.78' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='356.97' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='362.45' y='296.65' width='352.07' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='362.45' y='296.65' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzU2Ljk3fDQ1LjU3fDI2NS43Ng=='>
     <rect x='41.20' y='45.57' width='315.76' height='220.20' />
@@ -95,16 +125,6 @@
 <text transform='translate(18.53,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='41.20' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='362.45' y='22.78' width='352.07' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='362.45' y='22.78' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkzLjI4fDcwOS4wNHw0NS41N3wyNjUuNzY='>
     <rect x='393.28' y='45.57' width='315.76' height='220.20' />
@@ -156,16 +176,6 @@
 <text transform='translate(375.50,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='393.28' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='57.97px' lengthAdjust='spacingAndGlyphs'>s(x0):fac1</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='356.97' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzU2Ljk3fDMxOS40NHw1MzkuNjM='>
     <rect x='41.20' y='319.44' width='315.76' height='220.20' />
@@ -218,16 +228,6 @@
 <text transform='translate(18.53,429.53) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='41.20' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='57.97px' lengthAdjust='spacingAndGlyphs'>s(x0):fac2</text>
 </g>
-<defs>
-  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='362.45' y='296.65' width='352.07' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='362.45' y='296.65' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkzLjI4fDcwOS4wNHwzMTkuNDR8NTM5LjYz'>
     <rect x='393.28' y='319.44' width='315.76' height='220.20' />
diff --git a/tests/testthat/_snaps/derivatives/draw-issue-47-derivs-for-ordered-factor-by.svg b/tests/testthat/_snaps/derivatives/draw-issue-47-derivs-for-ordered-factor-by.svg
index 523dfbe43..3c88fd83a 100644
--- a/tests/testthat/_snaps/derivatives/draw-issue-47-derivs-for-ordered-factor-by.svg
+++ b/tests/testthat/_snaps/derivatives/draw-issue-47-derivs-for-ordered-factor-by.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='362.45' y='22.78' width='352.07' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='362.45' y='22.78' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='356.97' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='362.45' y='296.65' width='352.07' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='362.45' y='296.65' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzU2Ljk3fDQ1LjU3fDI2NS43Ng=='>
     <rect x='41.20' y='45.57' width='315.76' height='220.20' />
@@ -96,16 +126,6 @@
 <text transform='translate(18.53,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='41.20' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='362.45' y='22.78' width='352.07' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='362.45' y='22.78' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkzLjI4fDcwOS4wNHw0NS41N3wyNjUuNzY='>
     <rect x='393.28' y='45.57' width='315.76' height='220.20' />
@@ -157,16 +177,6 @@
 <text transform='translate(375.50,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='393.28' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='356.97' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzU2Ljk3fDMxOS40NHw1MzkuNjM='>
     <rect x='41.20' y='319.44' width='315.76' height='220.20' />
@@ -223,16 +233,6 @@
 <text transform='translate(18.53,429.53) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='41.20' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='65.31px' lengthAdjust='spacingAndGlyphs'>s(x0):ofac2</text>
 </g>
-<defs>
-  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='362.45' y='296.65' width='352.07' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='362.45' y='296.65' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkzLjI4fDcwOS4wNHwzMTkuNDR8NTM5LjYz'>
     <rect x='393.28' y='319.44' width='315.76' height='220.20' />
diff --git a/tests/testthat/_snaps/diagnostic-plots/appraise-diagnostic-plots.svg b/tests/testthat/_snaps/diagnostic-plots/appraise-diagnostic-plots.svg
index 43e42b080..24193f7c2 100644
--- a/tests/testthat/_snaps/diagnostic-plots/appraise-diagnostic-plots.svg
+++ b/tests/testthat/_snaps/diagnostic-plots/appraise-diagnostic-plots.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU3LjMxfDcxNC41MnwyMi43OHwzMDQuMzI='>
+    <rect x='357.31' y='22.78' width='357.21' height='281.54' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU3LjMxfDcxNC41MnwyMi43OHwzMDQuMzI=)'>
+<rect x='357.31' y='22.78' width='357.21' height='281.54' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTcuMzF8MzA0LjMyfDU3MC41Mg=='>
+    <rect x='5.48' y='304.32' width='351.83' height='266.20' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTcuMzF8MzA0LjMyfDU3MC41Mg==)'>
+<rect x='5.48' y='304.32' width='351.83' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzU3LjMxfDcxNC41MnwzMDQuMzJ8NTcwLjUy'>
+    <rect x='357.31' y='304.32' width='357.21' height='266.20' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU3LjMxfDcxNC41MnwzMDQuMzJ8NTcwLjUy)'>
+<rect x='357.31' y='304.32' width='357.21' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzguMjd8MzUxLjgzfDYwLjkwfDI3My40Mw=='>
     <rect x='38.27' y='60.90' width='313.56' height='212.53' />
@@ -195,16 +225,6 @@
 <text x='38.27' y='53.14' style='font-size: 11.00px; font-family: sans;' textLength='83.77px' lengthAdjust='spacingAndGlyphs'>Method: simulate</text>
 <text x='38.27' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='116.67px' lengthAdjust='spacingAndGlyphs'>QQ plot of residuals</text>
 </g>
-<defs>
-  <clipPath id='cpMzU3LjMxfDcxNC41MnwyMi43OHwzMDQuMzI='>
-    <rect x='357.31' y='22.78' width='357.21' height='281.54' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU3LjMxfDcxNC41MnwyMi43OHwzMDQuMzI=)'>
-<rect x='357.31' y='22.78' width='357.21' height='281.54' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk1LjQ4fDcwOS4wNHw2MC45MHwyNzMuNDM='>
     <rect x='395.48' y='60.90' width='313.56' height='212.53' />
@@ -345,16 +365,6 @@
 <text x='395.48' y='53.14' style='font-size: 11.00px; font-family: sans;' textLength='82.55px' lengthAdjust='spacingAndGlyphs'>Family: gaussian</text>
 <text x='395.48' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='165.83px' lengthAdjust='spacingAndGlyphs'>Residuals vs linear predictor</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTcuMzF8MzA0LjMyfDU3MC41Mg=='>
-    <rect x='5.48' y='304.32' width='351.83' height='266.20' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTcuMzF8MzA0LjMyfDU3MC41Mg==)'>
-<rect x='5.48' y='304.32' width='351.83' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzguMjd8MzUxLjgzfDMyNy4xMHw1MzkuNjM='>
     <rect x='38.27' y='327.10' width='313.56' height='212.53' />
@@ -414,16 +424,6 @@
 <text transform='translate(18.53,433.37) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='51.98px' lengthAdjust='spacingAndGlyphs'>Frequency</text>
 <text x='38.27' y='318.88' style='font-size: 13.20px; font-family: sans;' textLength='131.34px' lengthAdjust='spacingAndGlyphs'>Histogram of residuals</text>
 </g>
-<defs>
-  <clipPath id='cpMzU3LjMxfDcxNC41MnwzMDQuMzJ8NTcwLjUy'>
-    <rect x='357.31' y='304.32' width='357.21' height='266.20' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU3LjMxfDcxNC41MnwzMDQuMzJ8NTcwLjUy)'>
-<rect x='357.31' y='304.32' width='357.21' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk1LjQ4fDcwOS4wNHwzMjcuMTB8NTM5LjYz'>
     <rect x='395.48' y='327.10' width='313.56' height='212.53' />
diff --git a/tests/testthat/_snaps/diagnostic-plots/appraise-lm.svg b/tests/testthat/_snaps/diagnostic-plots/appraise-lm.svg
index 1f72ea884..53887856c 100644
--- a/tests/testthat/_snaps/diagnostic-plots/appraise-lm.svg
+++ b/tests/testthat/_snaps/diagnostic-plots/appraise-lm.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwzMDQuMzI='>
+    <rect x='360.00' y='22.78' width='354.52' height='281.54' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwzMDQuMzI=)'>
+<rect x='360.00' y='22.78' width='354.52' height='281.54' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8MzA0LjMyfDU3MC41Mg=='>
+    <rect x='5.48' y='304.32' width='354.52' height='266.20' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8MzA0LjMyfDU3MC41Mg==)'>
+<rect x='5.48' y='304.32' width='354.52' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwzMDQuMzJ8NTcwLjUy'>
+    <rect x='360.00' y='304.32' width='354.52' height='266.20' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwzMDQuMzJ8NTcwLjUy)'>
+<rect x='360.00' y='304.32' width='354.52' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzU0LjUyfDYwLjkwfDI3My40Mw=='>
     <rect x='41.20' y='60.90' width='313.32' height='212.53' />
@@ -389,16 +419,6 @@
 <text x='41.20' y='53.14' style='font-size: 11.00px; font-family: sans;' textLength='79.49px' lengthAdjust='spacingAndGlyphs'>Method: uniform</text>
 <text x='41.20' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='116.67px' lengthAdjust='spacingAndGlyphs'>QQ plot of residuals</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwzMDQuMzI='>
-    <rect x='360.00' y='22.78' width='354.52' height='281.54' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwzMDQuMzI=)'>
-<rect x='360.00' y='22.78' width='354.52' height='281.54' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk1LjcyfDcwOS4wNHw2MC45MHwyNzMuNDM='>
     <rect x='395.72' y='60.90' width='313.32' height='212.53' />
@@ -746,16 +766,6 @@
 <text x='395.72' y='53.14' style='font-size: 11.00px; font-family: sans;' textLength='82.55px' lengthAdjust='spacingAndGlyphs'>Family: gaussian</text>
 <text x='395.72' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='165.83px' lengthAdjust='spacingAndGlyphs'>Residuals vs linear predictor</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8MzA0LjMyfDU3MC41Mg=='>
-    <rect x='5.48' y='304.32' width='354.52' height='266.20' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8MzA0LjMyfDU3MC41Mg==)'>
-<rect x='5.48' y='304.32' width='354.52' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzU0LjUyfDMyNy4xMHw1MzkuNjM='>
     <rect x='41.20' y='327.10' width='313.32' height='212.53' />
@@ -816,16 +826,6 @@
 <text transform='translate(18.53,433.37) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='51.98px' lengthAdjust='spacingAndGlyphs'>Frequency</text>
 <text x='41.20' y='318.88' style='font-size: 13.20px; font-family: sans;' textLength='131.34px' lengthAdjust='spacingAndGlyphs'>Histogram of residuals</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwzMDQuMzJ8NTcwLjUy'>
-    <rect x='360.00' y='304.32' width='354.52' height='266.20' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwzMDQuMzJ8NTcwLjUy)'>
-<rect x='360.00' y='304.32' width='354.52' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk1LjcyfDcwOS4wNHwzMjcuMTB8NTM5LjYz'>
     <rect x='395.72' y='327.10' width='313.32' height='212.53' />
diff --git a/tests/testthat/_snaps/diagnostic-plots/appraise-worm-plot.svg b/tests/testthat/_snaps/diagnostic-plots/appraise-worm-plot.svg
index cdf93d180..16be913f9 100644
--- a/tests/testthat/_snaps/diagnostic-plots/appraise-worm-plot.svg
+++ b/tests/testthat/_snaps/diagnostic-plots/appraise-worm-plot.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwzMDQuMzI='>
+    <rect x='360.00' y='22.78' width='354.52' height='281.54' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwzMDQuMzI=)'>
+<rect x='360.00' y='22.78' width='354.52' height='281.54' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8MzA0LjMyfDU3MC41Mg=='>
+    <rect x='5.48' y='304.32' width='354.52' height='266.20' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8MzA0LjMyfDU3MC41Mg==)'>
+<rect x='5.48' y='304.32' width='354.52' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwzMDQuMzJ8NTcwLjUy'>
+    <rect x='360.00' y='304.32' width='354.52' height='266.20' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwzMDQuMzJ8NTcwLjUy)'>
+<rect x='360.00' y='304.32' width='354.52' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU0LjUyfDYwLjkwfDI3My40Mw=='>
     <rect x='43.65' y='60.90' width='310.87' height='212.53' />
@@ -196,16 +226,6 @@
 <text x='43.65' y='53.14' style='font-size: 11.00px; font-family: sans;' textLength='83.77px' lengthAdjust='spacingAndGlyphs'>Method: simulate</text>
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='131.32px' lengthAdjust='spacingAndGlyphs'>Worm plot of residuals</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwzMDQuMzI='>
-    <rect x='360.00' y='22.78' width='354.52' height='281.54' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwzMDQuMzI=)'>
-<rect x='360.00' y='22.78' width='354.52' height='281.54' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk4LjE3fDcwOS4wNHw2MC45MHwyNzMuNDM='>
     <rect x='398.17' y='60.90' width='310.87' height='212.53' />
@@ -346,16 +366,6 @@
 <text x='398.17' y='53.14' style='font-size: 11.00px; font-family: sans;' textLength='82.55px' lengthAdjust='spacingAndGlyphs'>Family: gaussian</text>
 <text x='398.17' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='165.83px' lengthAdjust='spacingAndGlyphs'>Residuals vs linear predictor</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8MzA0LjMyfDU3MC41Mg=='>
-    <rect x='5.48' y='304.32' width='354.52' height='266.20' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8MzA0LjMyfDU3MC41Mg==)'>
-<rect x='5.48' y='304.32' width='354.52' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU0LjUyfDMyNy4xMHw1MzkuNjM='>
     <rect x='43.65' y='327.10' width='310.87' height='212.53' />
@@ -415,16 +425,6 @@
 <text transform='translate(18.53,433.37) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='51.98px' lengthAdjust='spacingAndGlyphs'>Frequency</text>
 <text x='43.65' y='318.88' style='font-size: 13.20px; font-family: sans;' textLength='131.34px' lengthAdjust='spacingAndGlyphs'>Histogram of residuals</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwzMDQuMzJ8NTcwLjUy'>
-    <rect x='360.00' y='304.32' width='354.52' height='266.20' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwzMDQuMzJ8NTcwLjUy)'>
-<rect x='360.00' y='304.32' width='354.52' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk4LjE3fDcwOS4wNHwzMjcuMTB8NTM5LjYz'>
     <rect x='398.17' y='327.10' width='310.87' height='212.53' />
diff --git a/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-bam.svg b/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-bam.svg
index 40561aea5..322207a15 100644
--- a/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-bam.svg
+++ b/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-bam.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjk4fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.98' y='22.78' width='353.54' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjk4fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.98' y='22.78' width='353.54' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuOTh8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='355.50' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuOTh8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='355.50' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzguMjd8MzU1LjUwfDYzLjU5fDI2NS43Ng=='>
     <rect x='38.27' y='63.59' width='317.23' height='202.18' />
@@ -96,16 +116,6 @@
 <text x='122.13' y='53.54' style='font-size: 11.00px; font-family: sans;' textLength='6.12px' lengthAdjust='spacingAndGlyphs'>2</text>
 <text x='38.27' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='68.24px' lengthAdjust='spacingAndGlyphs'>s(x2) by fac</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjk4fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.98' y='22.78' width='353.54' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjk4fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.98' y='22.78' width='353.54' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkxLjgxfDcwOS4wNHw2My41OXwyNjUuNzY='>
     <rect x='391.81' y='63.59' width='317.23' height='202.18' />
@@ -160,16 +170,6 @@
 <text x='475.67' y='53.54' style='font-size: 11.00px; font-family: sans;' textLength='6.12px' lengthAdjust='spacingAndGlyphs'>3</text>
 <text x='391.81' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='68.24px' lengthAdjust='spacingAndGlyphs'>s(x2) by fac</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuOTh8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='355.50' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuOTh8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='355.50' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzguMjd8MzU1LjUwfDMzNy40NXw1MzkuNjM='>
     <rect x='38.27' y='337.45' width='317.23' height='202.18' />
diff --git a/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gam-fixed-scales.svg b/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gam-fixed-scales.svg
index 753ecce41..bc9d2aea6 100644
--- a/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gam-fixed-scales.svg
+++ b/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gam-fixed-scales.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzguMjd8MzU0LjUyfDYzLjU5fDI2NS43Ng=='>
     <rect x='38.27' y='63.59' width='316.25' height='202.18' />
@@ -96,16 +116,6 @@
 <text x='122.13' y='53.54' style='font-size: 11.00px; font-family: sans;' textLength='6.12px' lengthAdjust='spacingAndGlyphs'>2</text>
 <text x='38.27' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='68.24px' lengthAdjust='spacingAndGlyphs'>s(x2) by fac</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkyLjc5fDcwOS4wNHw2My41OXwyNjUuNzY='>
     <rect x='392.79' y='63.59' width='316.25' height='202.18' />
@@ -163,16 +173,6 @@
 <text x='476.66' y='53.54' style='font-size: 11.00px; font-family: sans;' textLength='6.12px' lengthAdjust='spacingAndGlyphs'>3</text>
 <text x='392.79' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='68.24px' lengthAdjust='spacingAndGlyphs'>s(x2) by fac</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzguMjd8MzU0LjUyfDMzNy40NXw1MzkuNjM='>
     <rect x='38.27' y='337.45' width='316.25' height='202.18' />
diff --git a/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gam-inc-grp-means.svg b/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gam-inc-grp-means.svg
index b69c7a2ad..28b644436 100644
--- a/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gam-inc-grp-means.svg
+++ b/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gam-inc-grp-means.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='362.45' y='22.78' width='352.07' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='362.45' y='22.78' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='356.97' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzU2Ljk3fDYzLjU5fDI2NS43Ng=='>
     <rect x='41.20' y='63.59' width='315.76' height='202.18' />
@@ -96,16 +116,6 @@
 <text x='125.07' y='53.54' style='font-size: 11.00px; font-family: sans;' textLength='6.12px' lengthAdjust='spacingAndGlyphs'>2</text>
 <text x='41.20' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='68.24px' lengthAdjust='spacingAndGlyphs'>s(x2) by fac</text>
 </g>
-<defs>
-  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='362.45' y='22.78' width='352.07' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='362.45' y='22.78' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkzLjI4fDcwOS4wNHw2My41OXwyNjUuNzY='>
     <rect x='393.28' y='63.59' width='315.76' height='202.18' />
@@ -163,16 +173,6 @@
 <text x='477.14' y='53.54' style='font-size: 11.00px; font-family: sans;' textLength='6.12px' lengthAdjust='spacingAndGlyphs'>3</text>
 <text x='393.28' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='68.24px' lengthAdjust='spacingAndGlyphs'>s(x2) by fac</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='356.97' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzU2Ljk3fDMzNy40NXw1MzkuNjM='>
     <rect x='41.20' y='337.45' width='315.76' height='202.18' />
diff --git a/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gam-ref-line.svg b/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gam-ref-line.svg
index 181c854c6..d9d5e519d 100644
--- a/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gam-ref-line.svg
+++ b/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gam-ref-line.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjk4fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.98' y='22.78' width='353.54' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjk4fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.98' y='22.78' width='353.54' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuOTh8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='355.50' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuOTh8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='355.50' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzguMjd8MzU1LjUwfDYzLjU5fDI2NS43Ng=='>
     <rect x='38.27' y='63.59' width='317.23' height='202.18' />
@@ -97,16 +117,6 @@
 <text x='122.13' y='53.54' style='font-size: 11.00px; font-family: sans;' textLength='6.12px' lengthAdjust='spacingAndGlyphs'>2</text>
 <text x='38.27' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='68.24px' lengthAdjust='spacingAndGlyphs'>s(x2) by fac</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjk4fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.98' y='22.78' width='353.54' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjk4fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.98' y='22.78' width='353.54' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkxLjgxfDcwOS4wNHw2My41OXwyNjUuNzY='>
     <rect x='391.81' y='63.59' width='317.23' height='202.18' />
@@ -162,16 +172,6 @@
 <text x='475.67' y='53.54' style='font-size: 11.00px; font-family: sans;' textLength='6.12px' lengthAdjust='spacingAndGlyphs'>3</text>
 <text x='391.81' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='68.24px' lengthAdjust='spacingAndGlyphs'>s(x2) by fac</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuOTh8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='355.50' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuOTh8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='355.50' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzguMjd8MzU1LjUwfDMzNy40NXw1MzkuNjM='>
     <rect x='38.27' y='337.45' width='317.23' height='202.18' />
diff --git a/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gam-user-data.svg b/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gam-user-data.svg
index 33dffc1cf..c86497e34 100644
--- a/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gam-user-data.svg
+++ b/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gam-user-data.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjk4fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.98' y='22.78' width='353.54' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjk4fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.98' y='22.78' width='353.54' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuOTh8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='355.50' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuOTh8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='355.50' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzguMjd8MzU1LjUwfDYzLjU5fDI2NS43Ng=='>
     <rect x='38.27' y='63.59' width='317.23' height='202.18' />
@@ -96,16 +116,6 @@
 <text x='122.13' y='53.54' style='font-size: 11.00px; font-family: sans;' textLength='6.12px' lengthAdjust='spacingAndGlyphs'>2</text>
 <text x='38.27' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='68.24px' lengthAdjust='spacingAndGlyphs'>s(x2) by fac</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjk4fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.98' y='22.78' width='353.54' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjk4fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.98' y='22.78' width='353.54' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkxLjgxfDcwOS4wNHw2My41OXwyNjUuNzY='>
     <rect x='391.81' y='63.59' width='317.23' height='202.18' />
@@ -160,16 +170,6 @@
 <text x='475.67' y='53.54' style='font-size: 11.00px; font-family: sans;' textLength='6.12px' lengthAdjust='spacingAndGlyphs'>3</text>
 <text x='391.81' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='68.24px' lengthAdjust='spacingAndGlyphs'>s(x2) by fac</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuOTh8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='355.50' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuOTh8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='355.50' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzguMjd8MzU1LjUwfDMzNy40NXw1MzkuNjM='>
     <rect x='38.27' y='337.45' width='317.23' height='202.18' />
diff --git a/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gam.svg b/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gam.svg
index 9730ecc92..14e444627 100644
--- a/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gam.svg
+++ b/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gam.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjk4fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.98' y='22.78' width='353.54' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjk4fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.98' y='22.78' width='353.54' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuOTh8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='355.50' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuOTh8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='355.50' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzguMjd8MzU1LjUwfDYzLjU5fDI2NS43Ng=='>
     <rect x='38.27' y='63.59' width='317.23' height='202.18' />
@@ -96,16 +116,6 @@
 <text x='122.13' y='53.54' style='font-size: 11.00px; font-family: sans;' textLength='6.12px' lengthAdjust='spacingAndGlyphs'>2</text>
 <text x='38.27' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='68.24px' lengthAdjust='spacingAndGlyphs'>s(x2) by fac</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjk4fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.98' y='22.78' width='353.54' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjk4fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.98' y='22.78' width='353.54' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkxLjgxfDcwOS4wNHw2My41OXwyNjUuNzY='>
     <rect x='391.81' y='63.59' width='317.23' height='202.18' />
@@ -160,16 +170,6 @@
 <text x='475.67' y='53.54' style='font-size: 11.00px; font-family: sans;' textLength='6.12px' lengthAdjust='spacingAndGlyphs'>3</text>
 <text x='391.81' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='68.24px' lengthAdjust='spacingAndGlyphs'>s(x2) by fac</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuOTh8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='355.50' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuOTh8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='355.50' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzguMjd8MzU1LjUwfDMzNy40NXw1MzkuNjM='>
     <rect x='38.27' y='337.45' width='317.23' height='202.18' />
diff --git a/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gamm.svg b/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gamm.svg
index 188d3432d..f35c0af22 100644
--- a/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gamm.svg
+++ b/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gamm.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYzLjY3fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='363.67' y='22.78' width='350.85' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYzLjY3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='363.67' y='22.78' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjMuNjd8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjMuNjd8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU4LjE5fDYzLjU5fDI2NS43Ng=='>
     <rect x='43.65' y='63.59' width='314.54' height='202.18' />
@@ -99,16 +119,6 @@
 <text x='127.51' y='53.54' style='font-size: 11.00px; font-family: sans;' textLength='6.12px' lengthAdjust='spacingAndGlyphs'>2</text>
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='68.24px' lengthAdjust='spacingAndGlyphs'>s(x2) by fac</text>
 </g>
-<defs>
-  <clipPath id='cpMzYzLjY3fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='363.67' y='22.78' width='350.85' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYzLjY3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='363.67' y='22.78' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHw2My41OXwyNjUuNzY='>
     <rect x='394.50' y='63.59' width='314.54' height='202.18' />
@@ -163,16 +173,6 @@
 <text x='478.36' y='53.54' style='font-size: 11.00px; font-family: sans;' textLength='6.12px' lengthAdjust='spacingAndGlyphs'>3</text>
 <text x='394.50' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='68.24px' lengthAdjust='spacingAndGlyphs'>s(x2) by fac</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjMuNjd8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjMuNjd8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU4LjE5fDMzNy40NXw1MzkuNjM='>
     <rect x='43.65' y='337.45' width='314.54' height='202.18' />
diff --git a/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gamm4.svg b/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gamm4.svg
index 5723ae397..3572f65ce 100644
--- a/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gamm4.svg
+++ b/tests/testthat/_snaps/difference-smooths/draw-difference-smooths-gamm4.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjk4fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.98' y='22.78' width='353.54' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjk4fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.98' y='22.78' width='353.54' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuOTh8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='355.50' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuOTh8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='355.50' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzguMjd8MzU1LjUwfDYzLjU5fDI2NS43Ng=='>
     <rect x='38.27' y='63.59' width='317.23' height='202.18' />
@@ -96,16 +116,6 @@
 <text x='122.13' y='53.54' style='font-size: 11.00px; font-family: sans;' textLength='6.12px' lengthAdjust='spacingAndGlyphs'>2</text>
 <text x='38.27' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='68.24px' lengthAdjust='spacingAndGlyphs'>s(x2) by fac</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjk4fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.98' y='22.78' width='353.54' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjk4fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.98' y='22.78' width='353.54' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkxLjgxfDcwOS4wNHw2My41OXwyNjUuNzY='>
     <rect x='391.81' y='63.59' width='317.23' height='202.18' />
@@ -160,16 +170,6 @@
 <text x='475.67' y='53.54' style='font-size: 11.00px; font-family: sans;' textLength='6.12px' lengthAdjust='spacingAndGlyphs'>3</text>
 <text x='391.81' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='68.24px' lengthAdjust='spacingAndGlyphs'>s(x2) by fac</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuOTh8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='355.50' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuOTh8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='355.50' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzguMjd8MzU1LjUwfDMzNy40NXw1MzkuNjM='>
     <rect x='38.27' y='337.45' width='317.23' height='202.18' />
diff --git a/tests/testthat/_snaps/draw-gam/draw-gam-m-2-fac-parametric.svg b/tests/testthat/_snaps/draw-gam/draw-gam-m-2-fac-parametric.svg
index a9f365b3e..5165c2ac9 100644
--- a/tests/testthat/_snaps/draw-gam/draw-gam-m-2-fac-parametric.svg
+++ b/tests/testthat/_snaps/draw-gam/draw-gam-m-2-fac-parametric.svg
@@ -39,6 +39,46 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMjQ0LjI3fDQ4My4wN3wyMi43OHwyOTYuNjU='>
+    <rect x='244.27' y='22.78' width='238.79' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjQ0LjI3fDQ4My4wN3wyMi43OHwyOTYuNjU=)'>
+<rect x='244.27' y='22.78' width='238.79' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNDgzLjA3fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='483.07' y='22.78' width='231.45' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNDgzLjA3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='483.07' y='22.78' width='231.45' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwyNDQuMjd8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='238.79' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwyNDQuMjd8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='238.79' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMjQ0LjI3fDQ4My4wN3wyOTYuNjV8NTcwLjUy'>
+    <rect x='244.27' y='296.65' width='238.79' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjQ0LjI3fDQ4My4wN3wyOTYuNjV8NTcwLjUy)'>
+<rect x='244.27' y='296.65' width='238.79' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MjM4Ljc5fDQ1LjU3fDI1Mi40MA=='>
     <rect x='43.65' y='45.57' width='195.15' height='206.84' />
@@ -89,16 +129,6 @@
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='238.79' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMjQ0LjI3fDQ4My4wN3wyMi43OHwyOTYuNjU='>
-    <rect x='244.27' y='22.78' width='238.79' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQ0LjI3fDQ4My4wN3wyMi43OHwyOTYuNjU=)'>
-<rect x='244.27' y='22.78' width='238.79' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjgyLjQ0fDQ3Ny41OXw0NS41N3wyNTIuNDA='>
     <rect x='282.44' y='45.57' width='195.15' height='206.84' />
@@ -149,16 +179,6 @@
 <text x='282.44' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='477.59' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNDgzLjA3fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='483.07' y='22.78' width='231.45' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNDgzLjA3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='483.07' y='22.78' width='231.45' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTEzLjkwfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='513.90' y='45.57' width='195.15' height='206.84' />
@@ -217,16 +237,6 @@
 <text x='513.90' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwyNDQuMjd8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='238.79' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwyNDQuMjd8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='238.79' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MjM4Ljc5fDMxOS40NHw1MjYuMjc='>
     <rect x='43.65' y='319.44' width='195.15' height='206.84' />
@@ -269,16 +279,6 @@
 <text x='43.65' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='17.61px' lengthAdjust='spacingAndGlyphs'>fac</text>
 <text x='238.79' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='24.94px' lengthAdjust='spacingAndGlyphs'>Factor</text>
 </g>
-<defs>
-  <clipPath id='cpMjQ0LjI3fDQ4My4wN3wyOTYuNjV8NTcwLjUy'>
-    <rect x='244.27' y='296.65' width='238.79' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQ0LjI3fDQ4My4wN3wyOTYuNjV8NTcwLjUy)'>
-<rect x='244.27' y='296.65' width='238.79' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjgyLjQ0fDQ3Ny41OXwzMTkuNDR8NTI2LjI3'>
     <rect x='282.44' y='319.44' width='195.15' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-gam/draw-gam-m-2-fac.svg b/tests/testthat/_snaps/draw-gam/draw-gam-m-2-fac.svg
index 7bcf27f2b..9995bd8ac 100644
--- a/tests/testthat/_snaps/draw-gam/draw-gam-m-2-fac.svg
+++ b/tests/testthat/_snaps/draw-gam/draw-gam-m-2-fac.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU0LjUyfDQ1LjU3fDI1Mi40MA=='>
     <rect x='43.65' y='45.57' width='310.87' height='206.84' />
@@ -89,16 +109,6 @@
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='354.52' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk4LjE3fDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='398.17' y='45.57' width='310.87' height='206.84' />
@@ -149,16 +159,6 @@
 <text x='398.17' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU0LjUyfDMxOS40NHw1MjYuMjc='>
     <rect x='43.65' y='319.44' width='310.87' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-gam/draw-gam-m-ar1-by.svg b/tests/testthat/_snaps/draw-gam/draw-gam-m-ar1-by.svg
index 2e21749df..d61b68f2a 100644
--- a/tests/testthat/_snaps/draw-gam/draw-gam-m-ar1-by.svg
+++ b/tests/testthat/_snaps/draw-gam/draw-gam-m-ar1-by.svg
@@ -39,6 +39,16 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI='>
+    <rect x='360.00' y='22.78' width='354.52' height='547.74' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI=)'>
+<rect x='360.00' y='22.78' width='354.52' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDYwLjkwfDUyNi4yNw=='>
     <rect x='36.31' y='60.90' width='318.21' height='465.37' />
@@ -90,16 +100,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='22.00px' lengthAdjust='spacingAndGlyphs'>s(x)</text>
 <text x='354.52' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI='>
-    <rect x='360.00' y='22.78' width='354.52' height='547.74' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI=)'>
-<rect x='360.00' y='22.78' width='354.52' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkwLjgzfDcwOS4wNHw2MC45MHw1MjYuMjc='>
     <rect x='390.83' y='60.90' width='318.21' height='465.37' />
diff --git a/tests/testthat/_snaps/draw-gam/draw-gam-m-bam.svg b/tests/testthat/_snaps/draw-gam/draw-gam-m-bam.svg
index 75557170a..6a4e67452 100644
--- a/tests/testthat/_snaps/draw-gam/draw-gam-m-bam.svg
+++ b/tests/testthat/_snaps/draw-gam/draw-gam-m-bam.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDQ1LjU3fDI1Mi40MA=='>
     <rect x='36.31' y='45.57' width='314.54' height='206.84' />
@@ -88,16 +118,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='350.85' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='394.50' y='45.57' width='314.54' height='206.84' />
@@ -147,16 +167,6 @@
 <text x='394.50' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDMxOS40NHw1MjYuMjc='>
     <rect x='36.31' y='319.44' width='314.54' height='206.84' />
@@ -210,16 +220,6 @@
 <text x='36.31' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='350.85' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHwzMTkuNDR8NTI2LjI3'>
     <rect x='394.50' y='319.44' width='314.54' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-gam/draw-gam-m-gam-constant-fun.svg b/tests/testthat/_snaps/draw-gam/draw-gam-m-gam-constant-fun.svg
index e5175a3fc..2bc4cb049 100644
--- a/tests/testthat/_snaps/draw-gam/draw-gam-m-gam-constant-fun.svg
+++ b/tests/testthat/_snaps/draw-gam/draw-gam-m-gam-constant-fun.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU3LjY4fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='357.68' y='22.78' width='356.84' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU3LjY4fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='357.68' y='22.78' width='356.84' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTcuNjh8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='352.20' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTcuNjh8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='352.20' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzU3LjY4fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='357.68' y='296.65' width='356.84' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU3LjY4fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='357.68' y='296.65' width='356.84' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNTMuMjB8MzUyLjIwfDQ1LjU3fDI1Mi40MA=='>
     <rect x='53.20' y='45.57' width='298.99' height='206.84' />
@@ -89,16 +119,6 @@
 <text x='53.20' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='352.20' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU3LjY4fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='357.68' y='22.78' width='356.84' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU3LjY4fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='357.68' y='22.78' width='356.84' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDEwLjA1fDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='410.05' y='45.57' width='298.99' height='206.84' />
@@ -156,16 +176,6 @@
 <text x='410.05' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTcuNjh8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='352.20' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTcuNjh8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='352.20' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTMuMjB8MzUyLjIwfDMxOS40NHw1MjYuMjc='>
     <rect x='53.20' y='319.44' width='298.99' height='206.84' />
@@ -219,16 +229,6 @@
 <text x='53.20' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='352.20' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU3LjY4fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='357.68' y='296.65' width='356.84' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU3LjY4fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='357.68' y='296.65' width='356.84' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDEwLjA1fDcwOS4wNHwzMTkuNDR8NTI2LjI3'>
     <rect x='410.05' y='319.44' width='298.99' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-gam/draw-gam-m-gam-constant.svg b/tests/testthat/_snaps/draw-gam/draw-gam-m-gam-constant.svg
index 9b4f3b8c9..8153ce455 100644
--- a/tests/testthat/_snaps/draw-gam/draw-gam-m-gam-constant.svg
+++ b/tests/testthat/_snaps/draw-gam/draw-gam-m-gam-constant.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='362.45' y='22.78' width='352.07' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='362.45' y='22.78' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='356.97' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='362.45' y='296.65' width='352.07' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='362.45' y='296.65' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDUuNjF8MzU2Ljk3fDQ1LjU3fDI1Mi40MA=='>
     <rect x='45.61' y='45.57' width='311.36' height='206.84' />
@@ -91,16 +121,6 @@
 <text x='45.61' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='356.97' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='362.45' y='22.78' width='352.07' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='362.45' y='22.78' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk3LjY5fDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='397.69' y='45.57' width='311.36' height='206.84' />
@@ -154,16 +174,6 @@
 <text x='397.69' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='356.97' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDUuNjF8MzU2Ljk3fDMxOS40NHw1MjYuMjc='>
     <rect x='45.61' y='319.44' width='311.36' height='206.84' />
@@ -218,16 +228,6 @@
 <text x='45.61' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='356.97' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='362.45' y='296.65' width='352.07' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='362.45' y='296.65' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk3LjY5fDcwOS4wNHwzMTkuNDR8NTI2LjI3'>
     <rect x='397.69' y='319.44' width='311.36' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-gam/draw-gam-m-gam-fun.svg b/tests/testthat/_snaps/draw-gam/draw-gam-m-gam-fun.svg
index a5d3038b4..61114b4d8 100644
--- a/tests/testthat/_snaps/draw-gam/draw-gam-m-gam-fun.svg
+++ b/tests/testthat/_snaps/draw-gam/draw-gam-m-gam-fun.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYxLjIyfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='361.22' y='22.78' width='353.30' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYxLjIyfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='361.22' y='22.78' width='353.30' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjEuMjJ8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='355.75' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjEuMjJ8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='355.75' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYxLjIyfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='361.22' y='296.65' width='353.30' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYxLjIyfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='361.22' y='296.65' width='353.30' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuMTd8MzU1Ljc1fDQ1LjU3fDI1Mi40MA=='>
     <rect x='43.17' y='45.57' width='312.58' height='206.84' />
@@ -85,16 +115,6 @@
 <text x='43.17' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='355.75' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYxLjIyfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='361.22' y='22.78' width='353.30' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYxLjIyfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='361.22' y='22.78' width='353.30' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk2LjQ2fDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='396.46' y='45.57' width='312.58' height='206.84' />
@@ -151,16 +171,6 @@
 <text x='396.46' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjEuMjJ8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='355.75' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjEuMjJ8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='355.75' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuMTd8MzU1Ljc1fDMxOS40NHw1MjYuMjc='>
     <rect x='43.17' y='319.44' width='312.58' height='206.84' />
@@ -217,16 +227,6 @@
 <text x='43.17' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='355.75' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYxLjIyfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='361.22' y='296.65' width='353.30' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYxLjIyfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='361.22' y='296.65' width='353.30' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk2LjQ2fDcwOS4wNHwzMTkuNDR8NTI2LjI3'>
     <rect x='396.46' y='319.44' width='312.58' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-gam/draw-gam-m-gam-rotated.svg b/tests/testthat/_snaps/draw-gam/draw-gam-m-gam-rotated.svg
index d74bc0fb4..abdacccc9 100644
--- a/tests/testthat/_snaps/draw-gam/draw-gam-m-gam-rotated.svg
+++ b/tests/testthat/_snaps/draw-gam/draw-gam-m-gam-rotated.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDQ1LjU3fDI0Mi42MA=='>
     <rect x='36.31' y='45.57' width='314.54' height='197.03' />
@@ -88,16 +118,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='350.85' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHw0NS41N3wyNDIuNjA='>
     <rect x='394.50' y='45.57' width='314.54' height='197.03' />
@@ -147,16 +167,6 @@
 <text x='394.50' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDMxOS40NHw1MTYuNDc='>
     <rect x='36.31' y='319.44' width='314.54' height='197.03' />
@@ -210,16 +220,6 @@
 <text x='36.31' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='350.85' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHwzMTkuNDR8NTE2LjQ3'>
     <rect x='394.50' y='319.44' width='314.54' height='197.03' />
diff --git a/tests/testthat/_snaps/draw-gam/draw-gam-m-gam.svg b/tests/testthat/_snaps/draw-gam/draw-gam-m-gam.svg
index b96f4c624..96dbc345e 100644
--- a/tests/testthat/_snaps/draw-gam/draw-gam-m-gam.svg
+++ b/tests/testthat/_snaps/draw-gam/draw-gam-m-gam.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDQ1LjU3fDI1Mi40MA=='>
     <rect x='36.31' y='45.57' width='314.54' height='206.84' />
@@ -88,16 +118,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='350.85' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='394.50' y='45.57' width='314.54' height='206.84' />
@@ -147,16 +167,6 @@
 <text x='394.50' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDMxOS40NHw1MjYuMjc='>
     <rect x='36.31' y='319.44' width='314.54' height='206.84' />
@@ -210,16 +220,6 @@
 <text x='36.31' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='350.85' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHwzMTkuNDR8NTI2LjI3'>
     <rect x='394.50' y='319.44' width='314.54' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-gam/draw-gam-m-gamgcv.svg b/tests/testthat/_snaps/draw-gam/draw-gam-m-gamgcv.svg
index 1ba284a93..2a1c412a6 100644
--- a/tests/testthat/_snaps/draw-gam/draw-gam-m-gamgcv.svg
+++ b/tests/testthat/_snaps/draw-gam/draw-gam-m-gamgcv.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDQ1LjU3fDI1Mi40MA=='>
     <rect x='36.31' y='45.57' width='314.54' height='206.84' />
@@ -91,16 +121,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='350.85' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='394.50' y='45.57' width='314.54' height='206.84' />
@@ -150,16 +170,6 @@
 <text x='394.50' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDMxOS40NHw1MjYuMjc='>
     <rect x='36.31' y='319.44' width='314.54' height='206.84' />
@@ -213,16 +223,6 @@
 <text x='36.31' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='350.85' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHwzMTkuNDR8NTI2LjI3'>
     <rect x='394.50' y='319.44' width='314.54' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-gam/draw-gam-m-gamm.svg b/tests/testthat/_snaps/draw-gam/draw-gam-m-gamm.svg
index 1222f9edd..ca3cd42d6 100644
--- a/tests/testthat/_snaps/draw-gam/draw-gam-m-gamm.svg
+++ b/tests/testthat/_snaps/draw-gam/draw-gam-m-gamm.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDQ1LjU3fDI1Mi40MA=='>
     <rect x='36.31' y='45.57' width='314.54' height='206.84' />
@@ -88,16 +118,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='350.85' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='394.50' y='45.57' width='314.54' height='206.84' />
@@ -147,16 +167,6 @@
 <text x='394.50' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDMxOS40NHw1MjYuMjc='>
     <rect x='36.31' y='319.44' width='314.54' height='206.84' />
@@ -210,16 +220,6 @@
 <text x='36.31' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='350.85' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHwzMTkuNDR8NTI2LjI3'>
     <rect x='394.50' y='319.44' width='314.54' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-gam/draw-gam-m-gamm4.svg b/tests/testthat/_snaps/draw-gam/draw-gam-m-gamm4.svg
index 5c4c0cef6..4f1bc61fc 100644
--- a/tests/testthat/_snaps/draw-gam/draw-gam-m-gamm4.svg
+++ b/tests/testthat/_snaps/draw-gam/draw-gam-m-gamm4.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDQ1LjU3fDI1Mi40MA=='>
     <rect x='36.31' y='45.57' width='314.54' height='206.84' />
@@ -88,16 +118,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='350.85' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='394.50' y='45.57' width='314.54' height='206.84' />
@@ -147,16 +167,6 @@
 <text x='394.50' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDMxOS40NHw1MjYuMjc='>
     <rect x='36.31' y='319.44' width='314.54' height='206.84' />
@@ -210,16 +220,6 @@
 <text x='36.31' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='350.85' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHwzMTkuNDR8NTI2LjI3'>
     <rect x='394.50' y='319.44' width='314.54' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-gam/draw-gam-m-gaulss.svg b/tests/testthat/_snaps/draw-gam/draw-gam-m-gaulss.svg
index 8c2208c0e..184d1bd83 100644
--- a/tests/testthat/_snaps/draw-gam/draw-gam-m-gaulss.svg
+++ b/tests/testthat/_snaps/draw-gam/draw-gam-m-gaulss.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDQ1LjU3fDI1Mi40MA=='>
     <rect x='36.31' y='45.57' width='314.54' height='206.84' />
@@ -88,16 +118,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='350.85' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='394.50' y='45.57' width='314.54' height='206.84' />
@@ -147,16 +167,6 @@
 <text x='394.50' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDMxOS40NHw1MjYuMjc='>
     <rect x='36.31' y='319.44' width='314.54' height='206.84' />
@@ -210,16 +220,6 @@
 <text x='36.31' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='350.85' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHwzMTkuNDR8NTI2LjI3'>
     <rect x='394.50' y='319.44' width='314.54' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-gam/draw-gam-m-para-sm-parametric.svg b/tests/testthat/_snaps/draw-gam/draw-gam-m-para-sm-parametric.svg
index 64e3e77c8..ac56a2a99 100644
--- a/tests/testthat/_snaps/draw-gam/draw-gam-m-para-sm-parametric.svg
+++ b/tests/testthat/_snaps/draw-gam/draw-gam-m-para-sm-parametric.svg
@@ -39,6 +39,46 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMjQ0LjI3fDQ4My4wN3wyMi43OHwyOTYuNjU='>
+    <rect x='244.27' y='22.78' width='238.79' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjQ0LjI3fDQ4My4wN3wyMi43OHwyOTYuNjU=)'>
+<rect x='244.27' y='22.78' width='238.79' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNDgzLjA3fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='483.07' y='22.78' width='231.45' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNDgzLjA3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='483.07' y='22.78' width='231.45' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwyNDQuMjd8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='238.79' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwyNDQuMjd8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='238.79' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMjQ0LjI3fDQ4My4wN3wyOTYuNjV8NTcwLjUy'>
+    <rect x='244.27' y='296.65' width='238.79' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjQ0LjI3fDQ4My4wN3wyOTYuNjV8NTcwLjUy)'>
+<rect x='244.27' y='296.65' width='238.79' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MjM4Ljc5fDQ1LjU3fDI1Mi40MA=='>
     <rect x='43.65' y='45.57' width='195.15' height='206.84' />
@@ -89,16 +129,6 @@
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='238.79' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMjQ0LjI3fDQ4My4wN3wyMi43OHwyOTYuNjU='>
-    <rect x='244.27' y='22.78' width='238.79' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQ0LjI3fDQ4My4wN3wyMi43OHwyOTYuNjU=)'>
-<rect x='244.27' y='22.78' width='238.79' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjgyLjQ0fDQ3Ny41OXw0NS41N3wyNTIuNDA='>
     <rect x='282.44' y='45.57' width='195.15' height='206.84' />
@@ -157,16 +187,6 @@
 <text x='282.44' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='477.59' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNDgzLjA3fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='483.07' y='22.78' width='231.45' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNDgzLjA3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='483.07' y='22.78' width='231.45' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTEzLjkwfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='513.90' y='45.57' width='195.15' height='206.84' />
@@ -209,16 +229,6 @@
 <text x='513.90' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='17.61px' lengthAdjust='spacingAndGlyphs'>fac</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='24.94px' lengthAdjust='spacingAndGlyphs'>Factor</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwyNDQuMjd8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='238.79' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwyNDQuMjd8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='238.79' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MjM4Ljc5fDMxOS40NHw1MjYuMjc='>
     <rect x='43.65' y='319.44' width='195.15' height='206.84' />
@@ -269,16 +279,6 @@
 <text x='43.65' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='7.33px' lengthAdjust='spacingAndGlyphs'>ff</text>
 <text x='238.79' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='24.94px' lengthAdjust='spacingAndGlyphs'>Factor</text>
 </g>
-<defs>
-  <clipPath id='cpMjQ0LjI3fDQ4My4wN3wyOTYuNjV8NTcwLjUy'>
-    <rect x='244.27' y='296.65' width='238.79' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQ0LjI3fDQ4My4wN3wyOTYuNjV8NTcwLjUy)'>
-<rect x='244.27' y='296.65' width='238.79' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjgyLjQ0fDQ3Ny41OXwzMTkuNDR8NTI2LjI3'>
     <rect x='282.44' y='319.44' width='195.15' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-gam/draw-gam-m-para-sm.svg b/tests/testthat/_snaps/draw-gam/draw-gam-m-para-sm.svg
index f098b0d79..01989e390 100644
--- a/tests/testthat/_snaps/draw-gam/draw-gam-m-para-sm.svg
+++ b/tests/testthat/_snaps/draw-gam/draw-gam-m-para-sm.svg
@@ -39,6 +39,16 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYzLjY3fDcxNC41MnwyMi43OHw1NzAuNTI='>
+    <rect x='363.67' y='22.78' width='350.85' height='547.74' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYzLjY3fDcxNC41MnwyMi43OHw1NzAuNTI=)'>
+<rect x='363.67' y='22.78' width='350.85' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU4LjE5fDQ1LjU3fDUyNi4yNw=='>
     <rect x='43.65' y='45.57' width='314.54' height='480.70' />
@@ -89,16 +99,6 @@
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='358.19' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYzLjY3fDcxNC41MnwyMi43OHw1NzAuNTI='>
-    <rect x='363.67' y='22.78' width='350.85' height='547.74' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYzLjY3fDcxNC41MnwyMi43OHw1NzAuNTI=)'>
-<rect x='363.67' y='22.78' width='350.85' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHw0NS41N3w1MjYuMjc='>
     <rect x='394.50' y='45.57' width='314.54' height='480.70' />
diff --git a/tests/testthat/_snaps/draw-gam/draw-gam-m-scat.svg b/tests/testthat/_snaps/draw-gam/draw-gam-m-scat.svg
index f058de7bd..498ca969e 100644
--- a/tests/testthat/_snaps/draw-gam/draw-gam-m-scat.svg
+++ b/tests/testthat/_snaps/draw-gam/draw-gam-m-scat.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDQ1LjU3fDI1Mi40MA=='>
     <rect x='36.31' y='45.57' width='314.54' height='206.84' />
@@ -88,16 +118,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='350.85' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='394.50' y='45.57' width='314.54' height='206.84' />
@@ -147,16 +167,6 @@
 <text x='394.50' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDMxOS40NHw1MjYuMjc='>
     <rect x='36.31' y='319.44' width='314.54' height='206.84' />
@@ -210,16 +220,6 @@
 <text x='36.31' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='350.85' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHwzMTkuNDR8NTI2LjI3'>
     <rect x='394.50' y='319.44' width='314.54' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-gam/draw-gam-parametric-only-model-rotated-labels.svg b/tests/testthat/_snaps/draw-gam/draw-gam-parametric-only-model-rotated-labels.svg
index a2b5d702c..eb924839b 100644
--- a/tests/testthat/_snaps/draw-gam/draw-gam-parametric-only-model-rotated-labels.svg
+++ b/tests/testthat/_snaps/draw-gam/draw-gam-parametric-only-model-rotated-labels.svg
@@ -39,6 +39,46 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMjQxLjgzfDQ3OC4xN3wyMi43OHwyOTYuNjU='>
+    <rect x='241.83' y='22.78' width='236.35' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjQxLjgzfDQ3OC4xN3wyMi43OHwyOTYuNjU=)'>
+<rect x='241.83' y='22.78' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNDc4LjE3fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='478.17' y='22.78' width='236.35' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNDc4LjE3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='478.17' y='22.78' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwyNDEuODN8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='236.35' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwyNDEuODN8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMjQxLjgzfDQ3OC4xN3wyOTYuNjV8NTcwLjUy'>
+    <rect x='241.83' y='296.65' width='236.35' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjQxLjgzfDQ3OC4xN3wyOTYuNjV8NTcwLjUy)'>
+<rect x='241.83' y='296.65' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MjM2LjM1fDQ1LjU3fDI0My4xNg=='>
     <rect x='43.65' y='45.57' width='192.70' height='197.59' />
@@ -81,16 +121,6 @@
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='17.61px' lengthAdjust='spacingAndGlyphs'>fac</text>
 <text x='236.35' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='24.94px' lengthAdjust='spacingAndGlyphs'>Factor</text>
 </g>
-<defs>
-  <clipPath id='cpMjQxLjgzfDQ3OC4xN3wyMi43OHwyOTYuNjU='>
-    <rect x='241.83' y='22.78' width='236.35' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQxLjgzfDQ3OC4xN3wyMi43OHwyOTYuNjU=)'>
-<rect x='241.83' y='22.78' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjgwLjAwfDQ3Mi42OXw0NS41N3wyNDMuMTY='>
     <rect x='280.00' y='45.57' width='192.70' height='197.59' />
@@ -141,16 +171,6 @@
 <text x='280.00' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='7.33px' lengthAdjust='spacingAndGlyphs'>ff</text>
 <text x='472.69' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='24.94px' lengthAdjust='spacingAndGlyphs'>Factor</text>
 </g>
-<defs>
-  <clipPath id='cpNDc4LjE3fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='478.17' y='22.78' width='236.35' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNDc4LjE3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='478.17' y='22.78' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTE2LjM0fDcwOS4wNHw0NS41N3wyNDMuMTY='>
     <rect x='516.34' y='45.57' width='192.70' height='197.59' />
@@ -205,16 +225,6 @@
 <text x='516.34' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='13.95px' lengthAdjust='spacingAndGlyphs'>x0</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='32.77px' lengthAdjust='spacingAndGlyphs'>Numeric</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwyNDEuODN8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='236.35' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwyNDEuODN8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MjM2LjM1fDMxOS40NHw1MTcuMDM='>
     <rect x='43.65' y='319.44' width='192.70' height='197.59' />
@@ -269,16 +279,6 @@
 <text x='43.65' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='13.95px' lengthAdjust='spacingAndGlyphs'>x1</text>
 <text x='236.35' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='32.77px' lengthAdjust='spacingAndGlyphs'>Numeric</text>
 </g>
-<defs>
-  <clipPath id='cpMjQxLjgzfDQ3OC4xN3wyOTYuNjV8NTcwLjUy'>
-    <rect x='241.83' y='296.65' width='236.35' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQxLjgzfDQ3OC4xN3wyOTYuNjV8NTcwLjUy)'>
-<rect x='241.83' y='296.65' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjgwLjAwfDQ3Mi42OXwzMTkuNDR8NTE3LjAz'>
     <rect x='280.00' y='319.44' width='192.70' height='197.59' />
diff --git a/tests/testthat/_snaps/draw-gam/draw-gam-rm1.svg b/tests/testthat/_snaps/draw-gam/draw-gam-rm1.svg
index c342f27bd..979553e19 100644
--- a/tests/testthat/_snaps/draw-gam/draw-gam-rm1.svg
+++ b/tests/testthat/_snaps/draw-gam/draw-gam-rm1.svg
@@ -39,6 +39,46 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMjQ0LjI3fDQ4My4wN3wyMi43OHwyOTYuNjU='>
+    <rect x='244.27' y='22.78' width='238.79' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjQ0LjI3fDQ4My4wN3wyMi43OHwyOTYuNjU=)'>
+<rect x='244.27' y='22.78' width='238.79' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNDgzLjA3fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='483.07' y='22.78' width='231.45' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNDgzLjA3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='483.07' y='22.78' width='231.45' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwyNDQuMjd8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='238.79' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwyNDQuMjd8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='238.79' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMjQ0LjI3fDQ4My4wN3wyOTYuNjV8NTcwLjUy'>
+    <rect x='244.27' y='296.65' width='238.79' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjQ0LjI3fDQ4My4wN3wyOTYuNjV8NTcwLjUy)'>
+<rect x='244.27' y='296.65' width='238.79' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MjM4Ljc5fDQ1LjU3fDI1Mi40MA=='>
     <rect x='43.65' y='45.57' width='195.15' height='206.84' />
@@ -93,16 +133,6 @@
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='33.01px' lengthAdjust='spacingAndGlyphs'>s(fac)</text>
 <text x='238.79' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='83.66px' lengthAdjust='spacingAndGlyphs'>Basis: Random effect</text>
 </g>
-<defs>
-  <clipPath id='cpMjQ0LjI3fDQ4My4wN3wyMi43OHwyOTYuNjU='>
-    <rect x='244.27' y='22.78' width='238.79' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQ0LjI3fDQ4My4wN3wyMi43OHwyOTYuNjU=)'>
-<rect x='244.27' y='22.78' width='238.79' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjgyLjQ0fDQ3Ny41OXw0NS41N3wyNTIuNDA='>
     <rect x='282.44' y='45.57' width='195.15' height='206.84' />
@@ -157,16 +187,6 @@
 <text x='282.44' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='477.59' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNDgzLjA3fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='483.07' y='22.78' width='231.45' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNDgzLjA3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='483.07' y='22.78' width='231.45' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTEzLjkwfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='513.90' y='45.57' width='195.15' height='206.84' />
@@ -220,16 +240,6 @@
 <text x='513.90' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwyNDQuMjd8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='238.79' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwyNDQuMjd8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='238.79' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MjM4Ljc5fDMxOS40NHw1MjYuMjc='>
     <rect x='43.65' y='319.44' width='195.15' height='206.84' />
@@ -280,16 +290,6 @@
 <text x='43.65' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='238.79' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMjQ0LjI3fDQ4My4wN3wyOTYuNjV8NTcwLjUy'>
-    <rect x='244.27' y='296.65' width='238.79' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQ0LjI3fDQ4My4wN3wyOTYuNjV8NTcwLjUy)'>
-<rect x='244.27' y='296.65' width='238.79' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjgyLjQ0fDQ3Ny41OXwzMTkuNDR8NTI2LjI3'>
     <rect x='282.44' y='319.44' width='195.15' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-gam/draw-gam-rm2.svg b/tests/testthat/_snaps/draw-gam/draw-gam-rm2.svg
index a63a1de94..012dcdb6a 100644
--- a/tests/testthat/_snaps/draw-gam/draw-gam-rm2.svg
+++ b/tests/testthat/_snaps/draw-gam/draw-gam-rm2.svg
@@ -39,6 +39,56 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMjQ4LjY4fDQ4MS42MHwyMi43OHwzMDQuMzI='>
+    <rect x='248.68' y='22.78' width='232.92' height='281.54' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjQ4LjY4fDQ4MS42MHwyMi43OHwzMDQuMzI=)'>
+<rect x='248.68' y='22.78' width='232.92' height='281.54' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNDgxLjYwfDcxNC41MnwyMi43OHwzMDQuMzI='>
+    <rect x='481.60' y='22.78' width='232.92' height='281.54' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNDgxLjYwfDcxNC41MnwyMi43OHwzMDQuMzI=)'>
+<rect x='481.60' y='22.78' width='232.92' height='281.54' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwyNDguNjh8MzA0LjMyfDU3MC41Mg=='>
+    <rect x='5.48' y='304.32' width='243.20' height='266.20' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwyNDguNjh8MzA0LjMyfDU3MC41Mg==)'>
+<rect x='5.48' y='304.32' width='243.20' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMjQ4LjY4fDQ4MS42MHwzMDQuMzJ8NTcwLjUy'>
+    <rect x='248.68' y='304.32' width='232.92' height='266.20' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjQ4LjY4fDQ4MS42MHwzMDQuMzJ8NTcwLjUy)'>
+<rect x='248.68' y='304.32' width='232.92' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNDgxLjYwfDcxNC41MnwzMDQuMzJ8NTcwLjUy'>
+    <rect x='481.60' y='304.32' width='232.92' height='266.20' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNDgxLjYwfDcxNC41MnwzMDQuMzJ8NTcwLjUy)'>
+<rect x='481.60' y='304.32' width='232.92' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNTMuOTJ8MjQzLjIwfDYwLjkwfDI2MC4wNw=='>
     <rect x='53.92' y='60.90' width='189.27' height='199.17' />
@@ -114,16 +164,6 @@
 <text x='53.92' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='45.48px' lengthAdjust='spacingAndGlyphs'>s(ranef)</text>
 <text x='243.20' y='297.01' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='83.66px' lengthAdjust='spacingAndGlyphs'>Basis: Random effect</text>
 </g>
-<defs>
-  <clipPath id='cpMjQ4LjY4fDQ4MS42MHwyMi43OHwzMDQuMzI='>
-    <rect x='248.68' y='22.78' width='232.92' height='281.54' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQ4LjY4fDQ4MS42MHwyMi43OHwzMDQuMzI=)'>
-<rect x='248.68' y='22.78' width='232.92' height='281.54' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjg2Ljg1fDQ3Ni4xMnw2MC45MHwyNjAuMDc='>
     <rect x='286.85' y='60.90' width='189.27' height='199.17' />
@@ -194,16 +234,6 @@
 <text x='286.85' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='45.48px' lengthAdjust='spacingAndGlyphs'>s(ranef)</text>
 <text x='476.12' y='297.01' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='83.66px' lengthAdjust='spacingAndGlyphs'>Basis: Random effect</text>
 </g>
-<defs>
-  <clipPath id='cpNDgxLjYwfDcxNC41MnwyMi43OHwzMDQuMzI='>
-    <rect x='481.60' y='22.78' width='232.92' height='281.54' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNDgxLjYwfDcxNC41MnwyMi43OHwzMDQuMzI=)'>
-<rect x='481.60' y='22.78' width='232.92' height='281.54' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTE5Ljc3fDcwOS4wNHw2MC45MHwyNjAuMDc='>
     <rect x='519.77' y='60.90' width='189.27' height='199.17' />
@@ -275,16 +305,6 @@
 <text x='519.77' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='45.48px' lengthAdjust='spacingAndGlyphs'>s(ranef)</text>
 <text x='709.04' y='297.01' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='83.66px' lengthAdjust='spacingAndGlyphs'>Basis: Random effect</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwyNDguNjh8MzA0LjMyfDU3MC41Mg=='>
-    <rect x='5.48' y='304.32' width='243.20' height='266.20' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwyNDguNjh8MzA0LjMyfDU3MC41Mg==)'>
-<rect x='5.48' y='304.32' width='243.20' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTMuOTJ8MjQzLjIwfDMyNy4xMHw1MjYuMjc='>
     <rect x='53.92' y='327.10' width='189.27' height='199.17' />
@@ -341,16 +361,6 @@
 <text x='53.92' y='318.88' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='243.20' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMjQ4LjY4fDQ4MS42MHwzMDQuMzJ8NTcwLjUy'>
-    <rect x='248.68' y='304.32' width='232.92' height='266.20' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQ4LjY4fDQ4MS42MHwzMDQuMzJ8NTcwLjUy)'>
-<rect x='248.68' y='304.32' width='232.92' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjg2Ljg1fDQ3Ni4xMnwzMjcuMTB8NTI2LjI3'>
     <rect x='286.85' y='327.10' width='189.27' height='199.17' />
@@ -407,16 +417,6 @@
 <text x='286.85' y='318.88' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='476.12' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNDgxLjYwfDcxNC41MnwzMDQuMzJ8NTcwLjUy'>
-    <rect x='481.60' y='304.32' width='232.92' height='266.20' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNDgxLjYwfDcxNC41MnwzMDQuMzJ8NTcwLjUy)'>
-<rect x='481.60' y='304.32' width='232.92' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTE5Ljc3fDcwOS4wNHwzMjcuMTB8NTI2LjI3'>
     <rect x='519.77' y='327.10' width='189.27' height='199.17' />
diff --git a/tests/testthat/_snaps/draw-gam/grouped-by-gam.svg b/tests/testthat/_snaps/draw-gam/grouped-by-gam.svg
index 7a30e2d53..85fb59fed 100644
--- a/tests/testthat/_snaps/draw-gam/grouped-by-gam.svg
+++ b/tests/testthat/_snaps/draw-gam/grouped-by-gam.svg
@@ -39,6 +39,16 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzc4LjY3fDcxNC41MnwyMi43OHw1NzAuNTI='>
+    <rect x='378.67' y='22.78' width='335.85' height='547.74' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzc4LjY3fDcxNC41MnwyMi43OHw1NzAuNTI=)'>
+<rect x='378.67' y='22.78' width='335.85' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzIzLjYyfDYwLjkwfDUyNi4yNw=='>
     <rect x='36.31' y='60.90' width='287.31' height='465.37' />
@@ -118,16 +128,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='323.62' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzc4LjY3fDcxNC41MnwyMi43OHw1NzAuNTI='>
-    <rect x='378.67' y='22.78' width='335.85' height='547.74' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzc4LjY3fDcxNC41MnwyMi43OHw1NzAuNTI=)'>
-<rect x='378.67' y='22.78' width='335.85' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDIxLjczfDcwOS4wNHw2MC45MHw1MjYuMjc='>
     <rect x='421.73' y='60.90' width='287.31' height='465.37' />
diff --git a/tests/testthat/_snaps/draw-gam/ordered-grouped-by-gam.svg b/tests/testthat/_snaps/draw-gam/ordered-grouped-by-gam.svg
index d6c53da89..838e8cb5c 100644
--- a/tests/testthat/_snaps/draw-gam/ordered-grouped-by-gam.svg
+++ b/tests/testthat/_snaps/draw-gam/ordered-grouped-by-gam.svg
@@ -39,6 +39,16 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzc4LjY3fDcxNC41MnwyMi43OHw1NzAuNTI='>
+    <rect x='378.67' y='22.78' width='335.85' height='547.74' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzc4LjY3fDcxNC41MnwyMi43OHw1NzAuNTI=)'>
+<rect x='378.67' y='22.78' width='335.85' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzIzLjYyfDYwLjkwfDUyNi4yNw=='>
     <rect x='36.31' y='60.90' width='287.31' height='465.37' />
@@ -118,16 +128,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='323.62' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzc4LjY3fDcxNC41MnwyMi43OHw1NzAuNTI='>
-    <rect x='378.67' y='22.78' width='335.85' height='547.74' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzc4LjY3fDcxNC41MnwyMi43OHw1NzAuNTI=)'>
-<rect x='378.67' y='22.78' width='335.85' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDIxLjczfDcwOS4wNHw2MC45MHw1MjYuMjc='>
     <rect x='421.73' y='60.90' width='287.31' height='465.37' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-am-with-factor-by-variable-smooth.svg b/tests/testthat/_snaps/draw-methods/draw-am-with-factor-by-variable-smooth.svg
index dc83faa29..ab7602bf6 100644
--- a/tests/testthat/_snaps/draw-methods/draw-am-with-factor-by-variable-smooth.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-am-with-factor-by-variable-smooth.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzUzLjg4fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='353.88' y='22.78' width='360.64' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzUzLjg4fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='353.88' y='22.78' width='360.64' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTMuODh8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='348.40' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTMuODh8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='348.40' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzUzLjg4fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='353.88' y='296.65' width='360.64' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzUzLjg4fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='353.88' y='296.65' width='360.64' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzQ4LjQwfDYwLjkwfDI1Mi40MA=='>
     <rect x='36.31' y='60.90' width='312.09' height='191.50' />
@@ -93,16 +123,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='348.40' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzUzLjg4fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='353.88' y='22.78' width='360.64' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzUzLjg4fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='353.88' y='22.78' width='360.64' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk2Ljk1fDcwOS4wNHw2MC45MHwyNTIuNDA='>
     <rect x='396.95' y='60.90' width='312.09' height='191.50' />
@@ -161,16 +181,6 @@
 <text x='396.95' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTMuODh8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='348.40' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTMuODh8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='348.40' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzQ4LjQwfDMzNC43N3w1MjYuMjc='>
     <rect x='36.31' y='334.77' width='312.09' height='191.50' />
@@ -225,16 +235,6 @@
 <text x='36.31' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='348.40' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzUzLjg4fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='353.88' y='296.65' width='360.64' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzUzLjg4fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='353.88' y='296.65' width='360.64' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk2Ljk1fDcwOS4wNHwzMzQuNzd8NTI2LjI3'>
     <rect x='396.95' y='334.77' width='312.09' height='191.50' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-by-factor-basis.svg b/tests/testthat/_snaps/draw-methods/draw-by-factor-basis.svg
index 582c7acbd..fbc3b5be5 100644
--- a/tests/testthat/_snaps/draw-methods/draw-by-factor-basis.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-by-factor-basis.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDYyLjIyfDI2NS43Ng=='>
     <rect x='36.31' y='62.22' width='318.21' height='203.55' />
@@ -111,16 +131,6 @@
 <text transform='translate(18.53,163.99) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='28.14px' lengthAdjust='spacingAndGlyphs'>Value</text>
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='57.97px' lengthAdjust='spacingAndGlyphs'>s(x2):fac1</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkwLjgzfDcwOS4wNHw2Mi4yMnwyNjUuNzY='>
     <rect x='390.83' y='62.22' width='318.21' height='203.55' />
@@ -193,16 +203,6 @@
 <text transform='translate(373.05,163.99) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='28.14px' lengthAdjust='spacingAndGlyphs'>Value</text>
 <text x='390.83' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='57.97px' lengthAdjust='spacingAndGlyphs'>s(x2):fac2</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDMzNi4wOXw1MzkuNjM='>
     <rect x='36.31' y='336.09' width='318.21' height='203.55' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-derivatives-for-a-gam-rotated-labels.svg b/tests/testthat/_snaps/draw-methods/draw-derivatives-for-a-gam-rotated-labels.svg
index 2a4cba014..0e46514a8 100644
--- a/tests/testthat/_snaps/draw-methods/draw-derivatives-for-a-gam-rotated-labels.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-derivatives-for-a-gam-rotated-labels.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzUwLjg1fDQ1LjU3fDI1NS45Ng=='>
     <rect x='41.20' y='45.57' width='309.65' height='210.39' />
@@ -94,16 +124,6 @@
 <text transform='translate(18.53,150.76) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='41.20' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk5LjM5fDcwOS4wNHw0NS41N3wyNTUuOTY='>
     <rect x='399.39' y='45.57' width='309.65' height='210.39' />
@@ -155,16 +175,6 @@
 <text transform='translate(369.38,150.76) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='399.39' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzUwLjg1fDMxOS40NHw1MjkuODM='>
     <rect x='41.20' y='319.44' width='309.65' height='210.39' />
@@ -221,16 +231,6 @@
 <text transform='translate(18.53,424.63) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='41.20' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk5LjM5fDcwOS4wNHwzMTkuNDR8NTI5Ljgz'>
     <rect x='399.39' y='319.44' width='309.65' height='210.39' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-derivatives-for-a-gam-with-default-change.svg b/tests/testthat/_snaps/draw-methods/draw-derivatives-for-a-gam-with-default-change.svg
index 99ca29f24..6eb5f5650 100644
--- a/tests/testthat/_snaps/draw-methods/draw-derivatives-for-a-gam-with-default-change.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-derivatives-for-a-gam-with-default-change.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzUwLjg1fDQ1LjU3fDI2NS43Ng=='>
     <rect x='41.20' y='45.57' width='309.65' height='220.20' />
@@ -96,16 +126,6 @@
 <text transform='translate(18.53,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='41.20' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk5LjM5fDcwOS4wNHw0NS41N3wyNjUuNzY='>
     <rect x='399.39' y='45.57' width='309.65' height='220.20' />
@@ -158,16 +178,6 @@
 <text transform='translate(369.38,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='399.39' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzUwLjg1fDMxOS40NHw1MzkuNjM='>
     <rect x='41.20' y='319.44' width='309.65' height='220.20' />
@@ -228,16 +238,6 @@
 <text transform='translate(18.53,429.53) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='41.20' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk5LjM5fDcwOS4wNHwzMTkuNDR8NTM5LjYz'>
     <rect x='399.39' y='319.44' width='309.65' height='220.20' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-derivatives-for-a-gam-with-fixed-scales-rotated.svg b/tests/testthat/_snaps/draw-methods/draw-derivatives-for-a-gam-with-fixed-scales-rotated.svg
index 09012e18b..3a2290ba5 100644
--- a/tests/testthat/_snaps/draw-methods/draw-derivatives-for-a-gam-with-fixed-scales-rotated.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-derivatives-for-a-gam-with-fixed-scales-rotated.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzU0LjUyfDQ1LjU3fDI1NS45Ng=='>
     <rect x='41.20' y='45.57' width='313.32' height='210.39' />
@@ -95,16 +125,6 @@
 <text transform='translate(18.53,150.76) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='41.20' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk1LjcyfDcwOS4wNHw0NS41N3wyNTUuOTY='>
     <rect x='395.72' y='45.57' width='313.32' height='210.39' />
@@ -161,16 +181,6 @@
 <text transform='translate(373.05,150.76) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='395.72' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzU0LjUyfDMxOS40NHw1MjkuODM='>
     <rect x='41.20' y='319.44' width='313.32' height='210.39' />
@@ -227,16 +237,6 @@
 <text transform='translate(18.53,424.63) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='41.20' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk1LjcyfDcwOS4wNHwzMTkuNDR8NTI5Ljgz'>
     <rect x='395.72' y='319.44' width='313.32' height='210.39' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-derivatives-for-a-gam-with-fixed-scales.svg b/tests/testthat/_snaps/draw-methods/draw-derivatives-for-a-gam-with-fixed-scales.svg
index 700d7e489..454ff4686 100644
--- a/tests/testthat/_snaps/draw-methods/draw-derivatives-for-a-gam-with-fixed-scales.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-derivatives-for-a-gam-with-fixed-scales.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzU0LjUyfDQ1LjU3fDI2NS43Ng=='>
     <rect x='41.20' y='45.57' width='313.32' height='220.20' />
@@ -95,16 +125,6 @@
 <text transform='translate(18.53,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='41.20' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk1LjcyfDcwOS4wNHw0NS41N3wyNjUuNzY='>
     <rect x='395.72' y='45.57' width='313.32' height='220.20' />
@@ -161,16 +181,6 @@
 <text transform='translate(373.05,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='395.72' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzU0LjUyfDMxOS40NHw1MzkuNjM='>
     <rect x='41.20' y='319.44' width='313.32' height='220.20' />
@@ -227,16 +237,6 @@
 <text transform='translate(18.53,429.53) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='41.20' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk1LjcyfDcwOS4wNHwzMTkuNDR8NTM5LjYz'>
     <rect x='395.72' y='319.44' width='313.32' height='220.20' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-derivatives-for-a-gam-with-sizer-change.svg b/tests/testthat/_snaps/draw-methods/draw-derivatives-for-a-gam-with-sizer-change.svg
index e12f585fb..3327c6b2c 100644
--- a/tests/testthat/_snaps/draw-methods/draw-derivatives-for-a-gam-with-sizer-change.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-derivatives-for-a-gam-with-sizer-change.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzUwLjg1fDQ1LjU3fDI2NS43Ng=='>
     <rect x='41.20' y='45.57' width='309.65' height='220.20' />
@@ -96,16 +126,6 @@
 <text transform='translate(18.53,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='41.20' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk5LjM5fDcwOS4wNHw0NS41N3wyNjUuNzY='>
     <rect x='399.39' y='45.57' width='309.65' height='220.20' />
@@ -158,16 +178,6 @@
 <text transform='translate(369.38,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='399.39' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzUwLjg1fDMxOS40NHw1MzkuNjM='>
     <rect x='41.20' y='319.44' width='309.65' height='220.20' />
@@ -228,16 +238,6 @@
 <text transform='translate(18.53,429.53) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='41.20' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk5LjM5fDcwOS4wNHwzMTkuNDR8NTM5LjYz'>
     <rect x='399.39' y='319.44' width='309.65' height='220.20' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-derivatives-for-a-gam.svg b/tests/testthat/_snaps/draw-methods/draw-derivatives-for-a-gam.svg
index f2948b9b0..d7342eafa 100644
--- a/tests/testthat/_snaps/draw-methods/draw-derivatives-for-a-gam.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-derivatives-for-a-gam.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzUwLjg1fDQ1LjU3fDI2NS43Ng=='>
     <rect x='41.20' y='45.57' width='309.65' height='220.20' />
@@ -94,16 +124,6 @@
 <text transform='translate(18.53,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='41.20' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk5LjM5fDcwOS4wNHw0NS41N3wyNjUuNzY='>
     <rect x='399.39' y='45.57' width='309.65' height='220.20' />
@@ -155,16 +175,6 @@
 <text transform='translate(369.38,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='399.39' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzUwLjg1fDMxOS40NHw1MzkuNjM='>
     <rect x='41.20' y='319.44' width='309.65' height='220.20' />
@@ -221,16 +231,6 @@
 <text transform='translate(18.53,429.53) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='48.91px' lengthAdjust='spacingAndGlyphs'>Derivative</text>
 <text x='41.20' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk5LjM5fDcwOS4wNHwzMTkuNDR8NTM5LjYz'>
     <rect x='399.39' y='319.44' width='309.65' height='220.20' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-factor-by-variable-smooth-with-fixed-scales.svg b/tests/testthat/_snaps/draw-methods/draw-factor-by-variable-smooth-with-fixed-scales.svg
index a850b260e..c5833f62e 100644
--- a/tests/testthat/_snaps/draw-methods/draw-factor-by-variable-smooth-with-fixed-scales.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-factor-by-variable-smooth-with-fixed-scales.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDYwLjkwfDI1Mi40MA=='>
     <rect x='36.31' y='60.90' width='318.21' height='191.50' />
@@ -96,16 +126,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='354.52' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkwLjgzfDcwOS4wNHw2MC45MHwyNTIuNDA='>
     <rect x='390.83' y='60.90' width='318.21' height='191.50' />
@@ -163,16 +183,6 @@
 <text x='390.83' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDMzNC43N3w1MjYuMjc='>
     <rect x='36.31' y='334.77' width='318.21' height='191.50' />
@@ -230,16 +240,6 @@
 <text x='36.31' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='354.52' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkwLjgzfDcwOS4wNHwzMzQuNzd8NTI2LjI3'>
     <rect x='390.83' y='334.77' width='318.21' height='191.50' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-fs-smooth-with-discrete-plasma-palette.svg b/tests/testthat/_snaps/draw-methods/draw-fs-smooth-with-discrete-plasma-palette.svg
index 68e97a54b..c55e1b1e2 100644
--- a/tests/testthat/_snaps/draw-methods/draw-fs-smooth-with-discrete-plasma-palette.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-fs-smooth-with-discrete-plasma-palette.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDQ1LjU3fDI1Mi40MA=='>
     <rect x='36.31' y='45.57' width='314.54' height='206.84' />
@@ -91,16 +111,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='350.85' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='394.50' y='45.57' width='314.54' height='206.84' />
@@ -164,16 +174,6 @@
 <text x='394.50' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='50.62px' lengthAdjust='spacingAndGlyphs'>s(x1,fac)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='82.67px' lengthAdjust='spacingAndGlyphs'>Basis: Factor smooth</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDMxOS40NHw1MjYuMjc='>
     <rect x='36.31' y='319.44' width='314.54' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-gam-model-with-fs-smooth.svg b/tests/testthat/_snaps/draw-methods/draw-gam-model-with-fs-smooth.svg
index 8e22d3dd7..242ddac89 100644
--- a/tests/testthat/_snaps/draw-methods/draw-gam-model-with-fs-smooth.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-gam-model-with-fs-smooth.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDQ1LjU3fDI1Mi40MA=='>
     <rect x='36.31' y='45.57' width='314.54' height='206.84' />
@@ -91,16 +111,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='350.85' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='394.50' y='45.57' width='314.54' height='206.84' />
@@ -164,16 +174,6 @@
 <text x='394.50' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='50.62px' lengthAdjust='spacingAndGlyphs'>s(x1,fac)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='82.67px' lengthAdjust='spacingAndGlyphs'>Basis: Factor smooth</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDMxOS40NHw1MjYuMjc='>
     <rect x='36.31' y='319.44' width='314.54' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-gam-model-with-ranef-smooth-factor-by.svg b/tests/testthat/_snaps/draw-methods/draw-gam-model-with-ranef-smooth-factor-by.svg
index ac85c7d51..f7892f845 100644
--- a/tests/testthat/_snaps/draw-methods/draw-gam-model-with-ranef-smooth-factor-by.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-gam-model-with-ranef-smooth-factor-by.svg
@@ -39,6 +39,56 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMjQ4LjY4fDQ4MS42MHwyMi43OHwzMDQuMzI='>
+    <rect x='248.68' y='22.78' width='232.92' height='281.54' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjQ4LjY4fDQ4MS42MHwyMi43OHwzMDQuMzI=)'>
+<rect x='248.68' y='22.78' width='232.92' height='281.54' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNDgxLjYwfDcxNC41MnwyMi43OHwzMDQuMzI='>
+    <rect x='481.60' y='22.78' width='232.92' height='281.54' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNDgxLjYwfDcxNC41MnwyMi43OHwzMDQuMzI=)'>
+<rect x='481.60' y='22.78' width='232.92' height='281.54' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwyNDguNjh8MzA0LjMyfDU3MC41Mg=='>
+    <rect x='5.48' y='304.32' width='243.20' height='266.20' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwyNDguNjh8MzA0LjMyfDU3MC41Mg==)'>
+<rect x='5.48' y='304.32' width='243.20' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMjQ4LjY4fDQ4MS42MHwzMDQuMzJ8NTcwLjUy'>
+    <rect x='248.68' y='304.32' width='232.92' height='266.20' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjQ4LjY4fDQ4MS42MHwzMDQuMzJ8NTcwLjUy)'>
+<rect x='248.68' y='304.32' width='232.92' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNDgxLjYwfDcxNC41MnwzMDQuMzJ8NTcwLjUy'>
+    <rect x='481.60' y='304.32' width='232.92' height='266.20' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNDgxLjYwfDcxNC41MnwzMDQuMzJ8NTcwLjUy)'>
+<rect x='481.60' y='304.32' width='232.92' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNTMuOTJ8MjQzLjIwfDYwLjkwfDI2MC4wNw=='>
     <rect x='53.92' y='60.90' width='189.27' height='199.17' />
@@ -114,16 +164,6 @@
 <text x='53.92' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='45.48px' lengthAdjust='spacingAndGlyphs'>s(ranef)</text>
 <text x='243.20' y='297.01' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='83.66px' lengthAdjust='spacingAndGlyphs'>Basis: Random effect</text>
 </g>
-<defs>
-  <clipPath id='cpMjQ4LjY4fDQ4MS42MHwyMi43OHwzMDQuMzI='>
-    <rect x='248.68' y='22.78' width='232.92' height='281.54' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQ4LjY4fDQ4MS42MHwyMi43OHwzMDQuMzI=)'>
-<rect x='248.68' y='22.78' width='232.92' height='281.54' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjg2Ljg1fDQ3Ni4xMnw2MC45MHwyNjAuMDc='>
     <rect x='286.85' y='60.90' width='189.27' height='199.17' />
@@ -194,16 +234,6 @@
 <text x='286.85' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='45.48px' lengthAdjust='spacingAndGlyphs'>s(ranef)</text>
 <text x='476.12' y='297.01' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='83.66px' lengthAdjust='spacingAndGlyphs'>Basis: Random effect</text>
 </g>
-<defs>
-  <clipPath id='cpNDgxLjYwfDcxNC41MnwyMi43OHwzMDQuMzI='>
-    <rect x='481.60' y='22.78' width='232.92' height='281.54' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNDgxLjYwfDcxNC41MnwyMi43OHwzMDQuMzI=)'>
-<rect x='481.60' y='22.78' width='232.92' height='281.54' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTE5Ljc3fDcwOS4wNHw2MC45MHwyNjAuMDc='>
     <rect x='519.77' y='60.90' width='189.27' height='199.17' />
@@ -275,16 +305,6 @@
 <text x='519.77' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='45.48px' lengthAdjust='spacingAndGlyphs'>s(ranef)</text>
 <text x='709.04' y='297.01' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='83.66px' lengthAdjust='spacingAndGlyphs'>Basis: Random effect</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwyNDguNjh8MzA0LjMyfDU3MC41Mg=='>
-    <rect x='5.48' y='304.32' width='243.20' height='266.20' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwyNDguNjh8MzA0LjMyfDU3MC41Mg==)'>
-<rect x='5.48' y='304.32' width='243.20' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTMuOTJ8MjQzLjIwfDMyNy4xMHw1MjYuMjc='>
     <rect x='53.92' y='327.10' width='189.27' height='199.17' />
@@ -341,16 +361,6 @@
 <text x='53.92' y='318.88' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='243.20' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMjQ4LjY4fDQ4MS42MHwzMDQuMzJ8NTcwLjUy'>
-    <rect x='248.68' y='304.32' width='232.92' height='266.20' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQ4LjY4fDQ4MS42MHwzMDQuMzJ8NTcwLjUy)'>
-<rect x='248.68' y='304.32' width='232.92' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjg2Ljg1fDQ3Ni4xMnwzMjcuMTB8NTI2LjI3'>
     <rect x='286.85' y='327.10' width='189.27' height='199.17' />
@@ -407,16 +417,6 @@
 <text x='286.85' y='318.88' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='476.12' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNDgxLjYwfDcxNC41MnwzMDQuMzJ8NTcwLjUy'>
-    <rect x='481.60' y='304.32' width='232.92' height='266.20' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNDgxLjYwfDcxNC41MnwzMDQuMzJ8NTcwLjUy)'>
-<rect x='481.60' y='304.32' width='232.92' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTE5Ljc3fDcwOS4wNHwzMjcuMTB8NTI2LjI3'>
     <rect x='519.77' y='327.10' width='189.27' height='199.17' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-gam-model-with-ranef-smooth.svg b/tests/testthat/_snaps/draw-methods/draw-gam-model-with-ranef-smooth.svg
index d27e73945..c64342b48 100644
--- a/tests/testthat/_snaps/draw-methods/draw-gam-model-with-ranef-smooth.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-gam-model-with-ranef-smooth.svg
@@ -39,6 +39,46 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMjQ0LjI3fDQ4My4wN3wyMi43OHwyOTYuNjU='>
+    <rect x='244.27' y='22.78' width='238.79' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjQ0LjI3fDQ4My4wN3wyMi43OHwyOTYuNjU=)'>
+<rect x='244.27' y='22.78' width='238.79' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNDgzLjA3fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='483.07' y='22.78' width='231.45' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNDgzLjA3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='483.07' y='22.78' width='231.45' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwyNDQuMjd8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='238.79' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwyNDQuMjd8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='238.79' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMjQ0LjI3fDQ4My4wN3wyOTYuNjV8NTcwLjUy'>
+    <rect x='244.27' y='296.65' width='238.79' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjQ0LjI3fDQ4My4wN3wyOTYuNjV8NTcwLjUy)'>
+<rect x='244.27' y='296.65' width='238.79' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MjM4Ljc5fDQ1LjU3fDI1Mi40MA=='>
     <rect x='43.65' y='45.57' width='195.15' height='206.84' />
@@ -93,16 +133,6 @@
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='33.01px' lengthAdjust='spacingAndGlyphs'>s(fac)</text>
 <text x='238.79' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='83.66px' lengthAdjust='spacingAndGlyphs'>Basis: Random effect</text>
 </g>
-<defs>
-  <clipPath id='cpMjQ0LjI3fDQ4My4wN3wyMi43OHwyOTYuNjU='>
-    <rect x='244.27' y='22.78' width='238.79' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQ0LjI3fDQ4My4wN3wyMi43OHwyOTYuNjU=)'>
-<rect x='244.27' y='22.78' width='238.79' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjgyLjQ0fDQ3Ny41OXw0NS41N3wyNTIuNDA='>
     <rect x='282.44' y='45.57' width='195.15' height='206.84' />
@@ -157,16 +187,6 @@
 <text x='282.44' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='477.59' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNDgzLjA3fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='483.07' y='22.78' width='231.45' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNDgzLjA3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='483.07' y='22.78' width='231.45' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTEzLjkwfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='513.90' y='45.57' width='195.15' height='206.84' />
@@ -220,16 +240,6 @@
 <text x='513.90' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwyNDQuMjd8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='238.79' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwyNDQuMjd8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='238.79' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MjM4Ljc5fDMxOS40NHw1MjYuMjc='>
     <rect x='43.65' y='319.44' width='195.15' height='206.84' />
@@ -280,16 +290,6 @@
 <text x='43.65' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='238.79' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMjQ0LjI3fDQ4My4wN3wyOTYuNjV8NTcwLjUy'>
-    <rect x='244.27' y='296.65' width='238.79' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQ0LjI3fDQ4My4wN3wyOTYuNjV8NTcwLjUy)'>
-<rect x='244.27' y='296.65' width='238.79' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjgyLjQ0fDQ3Ny41OXwzMTkuNDR8NTI2LjI3'>
     <rect x='282.44' y='319.44' width='195.15' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-gam-smooth-for-two-selected-smooths-character.svg b/tests/testthat/_snaps/draw-methods/draw-gam-smooth-for-two-selected-smooths-character.svg
index 96d6c69f4..1e8804a8d 100644
--- a/tests/testthat/_snaps/draw-methods/draw-gam-smooth-for-two-selected-smooths-character.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-gam-smooth-for-two-selected-smooths-character.svg
@@ -39,6 +39,16 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI='>
+    <rect x='360.00' y='22.78' width='354.52' height='547.74' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI=)'>
+<rect x='360.00' y='22.78' width='354.52' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDQ1LjU3fDUyNi4yNw=='>
     <rect x='36.31' y='45.57' width='318.21' height='480.70' />
@@ -93,16 +103,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='354.52' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI='>
-    <rect x='360.00' y='22.78' width='354.52' height='547.74' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI=)'>
-<rect x='360.00' y='22.78' width='354.52' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkwLjgzfDcwOS4wNHw0NS41N3w1MjYuMjc='>
     <rect x='390.83' y='45.57' width='318.21' height='480.70' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-gam-smooth-for-two-selected-smooths-logical.svg b/tests/testthat/_snaps/draw-methods/draw-gam-smooth-for-two-selected-smooths-logical.svg
index 52417836a..3b912318f 100644
--- a/tests/testthat/_snaps/draw-methods/draw-gam-smooth-for-two-selected-smooths-logical.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-gam-smooth-for-two-selected-smooths-logical.svg
@@ -39,6 +39,16 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI='>
+    <rect x='360.00' y='22.78' width='354.52' height='547.74' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI=)'>
+<rect x='360.00' y='22.78' width='354.52' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDQ1LjU3fDUyNi4yNw=='>
     <rect x='36.31' y='45.57' width='318.21' height='480.70' />
@@ -93,16 +103,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='354.52' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI='>
-    <rect x='360.00' y='22.78' width='354.52' height='547.74' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI=)'>
-<rect x='360.00' y='22.78' width='354.52' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkwLjgzfDcwOS4wNHw0NS41N3w1MjYuMjc='>
     <rect x='390.83' y='45.57' width='318.21' height='480.70' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-gam-smooth-for-two-selected-smooths-numeric.svg b/tests/testthat/_snaps/draw-methods/draw-gam-smooth-for-two-selected-smooths-numeric.svg
index 7a4f2f99a..caba151f3 100644
--- a/tests/testthat/_snaps/draw-methods/draw-gam-smooth-for-two-selected-smooths-numeric.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-gam-smooth-for-two-selected-smooths-numeric.svg
@@ -39,6 +39,16 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI='>
+    <rect x='360.00' y='22.78' width='354.52' height='547.74' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI=)'>
+<rect x='360.00' y='22.78' width='354.52' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDQ1LjU3fDUyNi4yNw=='>
     <rect x='36.31' y='45.57' width='318.21' height='480.70' />
@@ -93,16 +103,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='354.52' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI='>
-    <rect x='360.00' y='22.78' width='354.52' height='547.74' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI=)'>
-<rect x='360.00' y='22.78' width='354.52' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkwLjgzfDcwOS4wNHw0NS41N3w1MjYuMjc='>
     <rect x='390.83' y='45.57' width='318.21' height='480.70' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-gam-with-factor-parametric-term.svg b/tests/testthat/_snaps/draw-methods/draw-gam-with-factor-parametric-term.svg
index d9baa0298..b861b9cd2 100644
--- a/tests/testthat/_snaps/draw-methods/draw-gam-with-factor-parametric-term.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-gam-with-factor-parametric-term.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYzLjY3fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='363.67' y='22.78' width='350.85' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYzLjY3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='363.67' y='22.78' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjMuNjd8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjMuNjd8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU4LjE5fDQ1LjU3fDI1Mi40MA=='>
     <rect x='43.65' y='45.57' width='314.54' height='206.84' />
@@ -92,16 +112,6 @@
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='358.19' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYzLjY3fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='363.67' y='22.78' width='350.85' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYzLjY3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='363.67' y='22.78' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='394.50' y='45.57' width='314.54' height='206.84' />
@@ -152,16 +162,6 @@
 <text x='394.50' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjMuNjd8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjMuNjd8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU4LjE5fDMxOS40NHw1MjYuMjc='>
     <rect x='43.65' y='319.44' width='314.54' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-gam-with-linear-parametric-term.svg b/tests/testthat/_snaps/draw-methods/draw-gam-with-linear-parametric-term.svg
index 80ade63d6..f9009bbcf 100644
--- a/tests/testthat/_snaps/draw-methods/draw-gam-with-linear-parametric-term.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-gam-with-linear-parametric-term.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYzLjY3fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='363.67' y='22.78' width='350.85' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYzLjY3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='363.67' y='22.78' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjMuNjd8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjMuNjd8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU4LjE5fDQ1LjU3fDI1Mi40MA=='>
     <rect x='43.65' y='45.57' width='314.54' height='206.84' />
@@ -92,16 +112,6 @@
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='358.19' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYzLjY3fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='363.67' y='22.78' width='350.85' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYzLjY3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='363.67' y='22.78' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='394.50' y='45.57' width='314.54' height='206.84' />
@@ -152,16 +162,6 @@
 <text x='394.50' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjMuNjd8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjMuNjd8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU4LjE5fDMxOS40NHw1MjYuMjc='>
     <rect x='43.65' y='319.44' width='314.54' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-gam-with-overall-uncertainty-false.svg b/tests/testthat/_snaps/draw-methods/draw-gam-with-overall-uncertainty-false.svg
index a65ebcec9..efac2a6e5 100644
--- a/tests/testthat/_snaps/draw-methods/draw-gam-with-overall-uncertainty-false.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-gam-with-overall-uncertainty-false.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDQ1LjU3fDI1Mi40MA=='>
     <rect x='36.31' y='45.57' width='314.54' height='206.84' />
@@ -88,16 +118,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='350.85' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='394.50' y='45.57' width='314.54' height='206.84' />
@@ -147,16 +167,6 @@
 <text x='394.50' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDMxOS40NHw1MjYuMjc='>
     <rect x='36.31' y='319.44' width='314.54' height='206.84' />
@@ -210,16 +220,6 @@
 <text x='36.31' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='350.85' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHwzMTkuNDR8NTI2LjI3'>
     <rect x='394.50' y='319.44' width='314.54' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-gam-with-partial-match-true.svg b/tests/testthat/_snaps/draw-methods/draw-gam-with-partial-match-true.svg
index 00b4e0b56..65da32198 100644
--- a/tests/testthat/_snaps/draw-methods/draw-gam-with-partial-match-true.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-gam-with-partial-match-true.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDYwLjkwfDI1Mi40MA=='>
     <rect x='36.31' y='60.90' width='318.21' height='191.50' />
@@ -93,16 +113,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='354.52' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkwLjgzfDcwOS4wNHw2MC45MHwyNTIuNDA='>
     <rect x='390.83' y='60.90' width='318.21' height='191.50' />
@@ -161,16 +171,6 @@
 <text x='390.83' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDMzNC43N3w1MjYuMjc='>
     <rect x='36.31' y='334.77' width='318.21' height='191.50' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-gam-with-select-and-parametric-is-false.svg b/tests/testthat/_snaps/draw-methods/draw-gam-with-select-and-parametric-is-false.svg
index e0dfebb7d..e4de892a2 100644
--- a/tests/testthat/_snaps/draw-methods/draw-gam-with-select-and-parametric-is-false.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-gam-with-select-and-parametric-is-false.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDYwLjkwfDI1Mi40MA=='>
     <rect x='36.31' y='60.90' width='318.21' height='191.50' />
@@ -93,16 +113,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='354.52' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkwLjgzfDcwOS4wNHw2MC45MHwyNTIuNDA='>
     <rect x='390.83' y='60.90' width='318.21' height='191.50' />
@@ -161,16 +171,6 @@
 <text x='390.83' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDMzNC43N3w1MjYuMjc='>
     <rect x='36.31' y='334.77' width='318.21' height='191.50' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-gam-with-select-and-parametric-is-null.svg b/tests/testthat/_snaps/draw-methods/draw-gam-with-select-and-parametric-is-null.svg
index bf297f03f..d9b3a4175 100644
--- a/tests/testthat/_snaps/draw-methods/draw-gam-with-select-and-parametric-is-null.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-gam-with-select-and-parametric-is-null.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDYwLjkwfDI1Mi40MA=='>
     <rect x='36.31' y='60.90' width='318.21' height='191.50' />
@@ -93,16 +113,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='354.52' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkwLjgzfDcwOS4wNHw2MC45MHwyNTIuNDA='>
     <rect x='390.83' y='60.90' width='318.21' height='191.50' />
@@ -161,16 +171,6 @@
 <text x='390.83' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDMzNC43N3w1MjYuMjc='>
     <rect x='36.31' y='334.77' width='318.21' height='191.50' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-gam-with-select-and-parametric-is-true.svg b/tests/testthat/_snaps/draw-methods/draw-gam-with-select-and-parametric-is-true.svg
index 14c2db063..215e484ee 100644
--- a/tests/testthat/_snaps/draw-methods/draw-gam-with-select-and-parametric-is-true.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-gam-with-select-and-parametric-is-true.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDYwLjkwfDI1Mi40MA=='>
     <rect x='36.31' y='60.90' width='318.21' height='191.50' />
@@ -93,16 +123,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='354.52' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkwLjgzfDcwOS4wNHw2MC45MHwyNTIuNDA='>
     <rect x='390.83' y='60.90' width='318.21' height='191.50' />
@@ -161,16 +181,6 @@
 <text x='390.83' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDMzNC43N3w1MjYuMjc='>
     <rect x='36.31' y='334.77' width='318.21' height='191.50' />
@@ -225,16 +235,6 @@
 <text x='36.31' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='354.52' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkwLjgzfDcwOS4wNHwzMzQuNzd8NTI2LjI3'>
     <rect x='390.83' y='334.77' width='318.21' height='191.50' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-gam-without-select-and-parametric-is-false.svg b/tests/testthat/_snaps/draw-methods/draw-gam-without-select-and-parametric-is-false.svg
index b1ac84d62..c0af93d64 100644
--- a/tests/testthat/_snaps/draw-methods/draw-gam-without-select-and-parametric-is-false.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-gam-without-select-and-parametric-is-false.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzUzLjg4fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='353.88' y='22.78' width='360.64' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzUzLjg4fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='353.88' y='22.78' width='360.64' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTMuODh8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='348.40' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTMuODh8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='348.40' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzUzLjg4fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='353.88' y='296.65' width='360.64' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzUzLjg4fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='353.88' y='296.65' width='360.64' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzQ4LjQwfDYwLjkwfDI1Mi40MA=='>
     <rect x='36.31' y='60.90' width='312.09' height='191.50' />
@@ -93,16 +123,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='348.40' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzUzLjg4fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='353.88' y='22.78' width='360.64' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzUzLjg4fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='353.88' y='22.78' width='360.64' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk2Ljk1fDcwOS4wNHw2MC45MHwyNTIuNDA='>
     <rect x='396.95' y='60.90' width='312.09' height='191.50' />
@@ -161,16 +181,6 @@
 <text x='396.95' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTMuODh8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='348.40' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTMuODh8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='348.40' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzQ4LjQwfDMzNC43N3w1MjYuMjc='>
     <rect x='36.31' y='334.77' width='312.09' height='191.50' />
@@ -225,16 +235,6 @@
 <text x='36.31' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='348.40' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzUzLjg4fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='353.88' y='296.65' width='360.64' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzUzLjg4fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='353.88' y='296.65' width='360.64' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk2Ljk1fDcwOS4wNHwzMzQuNzd8NTI2LjI3'>
     <rect x='396.95' y='334.77' width='312.09' height='191.50' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-gam-without-select-and-parametric-is-true.svg b/tests/testthat/_snaps/draw-methods/draw-gam-without-select-and-parametric-is-true.svg
index 864be3f48..30f49e0a8 100644
--- a/tests/testthat/_snaps/draw-methods/draw-gam-without-select-and-parametric-is-true.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-gam-without-select-and-parametric-is-true.svg
@@ -39,6 +39,46 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMjQ5Ljk4fDQ4Mi4yNXwyMi43OHwzMDQuMzI='>
+    <rect x='249.98' y='22.78' width='232.27' height='281.54' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjQ5Ljk4fDQ4Mi4yNXwyMi43OHwzMDQuMzI=)'>
+<rect x='249.98' y='22.78' width='232.27' height='281.54' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNDgyLjI1fDcxNC41MnwyMi43OHwzMDQuMzI='>
+    <rect x='482.25' y='22.78' width='232.27' height='281.54' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNDgyLjI1fDcxNC41MnwyMi43OHwzMDQuMzI=)'>
+<rect x='482.25' y='22.78' width='232.27' height='281.54' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwyNDkuOTh8MzA0LjMyfDU3MC41Mg=='>
+    <rect x='5.48' y='304.32' width='244.50' height='266.20' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwyNDkuOTh8MzA0LjMyfDU3MC41Mg==)'>
+<rect x='5.48' y='304.32' width='244.50' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMjQ5Ljk4fDQ4Mi4yNXwzMDQuMzJ8NTcwLjUy'>
+    <rect x='249.98' y='304.32' width='232.27' height='266.20' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjQ5Ljk4fDQ4Mi4yNXwzMDQuMzJ8NTcwLjUy)'>
+<rect x='249.98' y='304.32' width='232.27' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDguNTR8MjQ0LjUwfDYwLjkwfDI2MC4wNw=='>
     <rect x='48.54' y='60.90' width='195.96' height='199.17' />
@@ -93,16 +133,6 @@
 <text x='48.54' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='244.50' y='297.01' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMjQ5Ljk4fDQ4Mi4yNXwyMi43OHwzMDQuMzI='>
-    <rect x='249.98' y='22.78' width='232.27' height='281.54' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQ5Ljk4fDQ4Mi4yNXwyMi43OHwzMDQuMzI=)'>
-<rect x='249.98' y='22.78' width='232.27' height='281.54' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjgwLjgxfDQ3Ni43N3w2MC45MHwyNjAuMDc='>
     <rect x='280.81' y='60.90' width='195.96' height='199.17' />
@@ -161,16 +191,6 @@
 <text x='280.81' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='476.77' y='297.01' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNDgyLjI1fDcxNC41MnwyMi43OHwzMDQuMzI='>
-    <rect x='482.25' y='22.78' width='232.27' height='281.54' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNDgyLjI1fDcxNC41MnwyMi43OHwzMDQuMzI=)'>
-<rect x='482.25' y='22.78' width='232.27' height='281.54' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTEzLjA4fDcwOS4wNHw2MC45MHwyNjAuMDc='>
     <rect x='513.08' y='60.90' width='195.96' height='199.17' />
@@ -225,16 +245,6 @@
 <text x='513.08' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='709.04' y='297.01' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwyNDkuOTh8MzA0LjMyfDU3MC41Mg=='>
-    <rect x='5.48' y='304.32' width='244.50' height='266.20' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwyNDkuOTh8MzA0LjMyfDU3MC41Mg==)'>
-<rect x='5.48' y='304.32' width='244.50' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDguNTR8MjQ0LjUwfDMyNy4xMHw1MjYuMjc='>
     <rect x='48.54' y='327.10' width='195.96' height='199.17' />
@@ -285,16 +295,6 @@
 <text x='48.54' y='318.88' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='244.50' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMjQ5Ljk4fDQ4Mi4yNXwzMDQuMzJ8NTcwLjUy'>
-    <rect x='249.98' y='304.32' width='232.27' height='266.20' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQ5Ljk4fDQ4Mi4yNXwzMDQuMzJ8NTcwLjUy)'>
-<rect x='249.98' y='304.32' width='232.27' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjgwLjgxfDQ3Ni43N3wzMjcuMTB8NTI2LjI3'>
     <rect x='280.81' y='327.10' width='195.96' height='199.17' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-issue-39-empty-plots.svg b/tests/testthat/_snaps/draw-methods/draw-issue-39-empty-plots.svg
index 4eff154ac..b5fae9704 100644
--- a/tests/testthat/_snaps/draw-methods/draw-issue-39-empty-plots.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-issue-39-empty-plots.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU0LjUyfDQ1LjU3fDI1Mi40MA=='>
     <rect x='43.65' y='45.57' width='310.87' height='206.84' />
@@ -89,16 +109,6 @@
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='354.52' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk4LjE3fDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='398.17' y='45.57' width='310.87' height='206.84' />
@@ -149,16 +159,6 @@
 <text x='398.17' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU0LjUyfDMxOS40NHw1MjYuMjc='>
     <rect x='43.65' y='319.44' width='310.87' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-model-with-fs-smooth-fixed-scales.svg b/tests/testthat/_snaps/draw-methods/draw-model-with-fs-smooth-fixed-scales.svg
index 2d46a9f64..d1b810734 100644
--- a/tests/testthat/_snaps/draw-methods/draw-model-with-fs-smooth-fixed-scales.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-model-with-fs-smooth-fixed-scales.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDQ1LjU3fDI1Mi40MA=='>
     <rect x='36.31' y='45.57' width='318.21' height='206.84' />
@@ -92,16 +112,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='354.52' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkwLjgzfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='390.83' y='45.57' width='318.21' height='206.84' />
@@ -161,16 +171,6 @@
 <text x='390.83' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='50.62px' lengthAdjust='spacingAndGlyphs'>s(x1,fac)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='82.67px' lengthAdjust='spacingAndGlyphs'>Basis: Factor smooth</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDMxOS40NHw1MjYuMjc='>
     <rect x='36.31' y='319.44' width='318.21' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-model-with-ranef-smooth-fixed-scales.svg b/tests/testthat/_snaps/draw-methods/draw-model-with-ranef-smooth-fixed-scales.svg
index d6ee8420f..804e76892 100644
--- a/tests/testthat/_snaps/draw-methods/draw-model-with-ranef-smooth-fixed-scales.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-model-with-ranef-smooth-fixed-scales.svg
@@ -39,6 +39,46 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMjQxLjgzfDQ3OC4xN3wyMi43OHwyOTYuNjU='>
+    <rect x='241.83' y='22.78' width='236.35' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjQxLjgzfDQ3OC4xN3wyMi43OHwyOTYuNjU=)'>
+<rect x='241.83' y='22.78' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNDc4LjE3fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='478.17' y='22.78' width='236.35' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNDc4LjE3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='478.17' y='22.78' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwyNDEuODN8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='236.35' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwyNDEuODN8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMjQxLjgzfDQ3OC4xN3wyOTYuNjV8NTcwLjUy'>
+    <rect x='241.83' y='296.65' width='236.35' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjQxLjgzfDQ3OC4xN3wyOTYuNjV8NTcwLjUy)'>
+<rect x='241.83' y='296.65' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MjM2LjM1fDQ1LjU3fDI1Mi40MA=='>
     <rect x='36.31' y='45.57' width='200.04' height='206.84' />
@@ -90,16 +130,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='33.01px' lengthAdjust='spacingAndGlyphs'>s(fac)</text>
 <text x='236.35' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='83.66px' lengthAdjust='spacingAndGlyphs'>Basis: Random effect</text>
 </g>
-<defs>
-  <clipPath id='cpMjQxLjgzfDQ3OC4xN3wyMi43OHwyOTYuNjU='>
-    <rect x='241.83' y='22.78' width='236.35' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQxLjgzfDQ3OC4xN3wyMi43OHwyOTYuNjU=)'>
-<rect x='241.83' y='22.78' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjcyLjY2fDQ3Mi42OXw0NS41N3wyNTIuNDA='>
     <rect x='272.66' y='45.57' width='200.04' height='206.84' />
@@ -150,16 +180,6 @@
 <text x='272.66' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='472.69' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNDc4LjE3fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='478.17' y='22.78' width='236.35' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNDc4LjE3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='478.17' y='22.78' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTA5LjAwfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='509.00' y='45.57' width='200.04' height='206.84' />
@@ -210,16 +230,6 @@
 <text x='509.00' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwyNDEuODN8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='236.35' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwyNDEuODN8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MjM2LjM1fDMxOS40NHw1MjYuMjc='>
     <rect x='36.31' y='319.44' width='200.04' height='206.84' />
@@ -270,16 +280,6 @@
 <text x='36.31' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='236.35' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMjQxLjgzfDQ3OC4xN3wyOTYuNjV8NTcwLjUy'>
-    <rect x='241.83' y='296.65' width='236.35' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQxLjgzfDQ3OC4xN3wyOTYuNjV8NTcwLjUy)'>
-<rect x='241.83' y='296.65' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjcyLjY2fDQ3Mi42OXwzMTkuNDR8NTI2LjI3'>
     <rect x='272.66' y='319.44' width='200.04' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-selected-factor-by-smooth-samples-for-gam-m3.svg b/tests/testthat/_snaps/draw-methods/draw-selected-factor-by-smooth-samples-for-gam-m3.svg
index 596b7237e..78ccd4122 100644
--- a/tests/testthat/_snaps/draw-methods/draw-selected-factor-by-smooth-samples-for-gam-m3.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-selected-factor-by-smooth-samples-for-gam-m3.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYzLjY3fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='363.67' y='22.78' width='350.85' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYzLjY3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='363.67' y='22.78' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjMuNjd8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjMuNjd8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU4LjE5fDYwLjkwfDI2NS43Ng=='>
     <rect x='43.65' y='60.90' width='314.54' height='204.86' />
@@ -97,16 +117,6 @@
 <text x='43.65' y='53.14' style='font-size: 11.00px; font-family: sans;' textLength='45.86px' lengthAdjust='spacingAndGlyphs'>By: fac; 1</text>
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzYzLjY3fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='363.67' y='22.78' width='350.85' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYzLjY3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='363.67' y='22.78' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHw2MC45MHwyNjUuNzY='>
     <rect x='394.50' y='60.90' width='314.54' height='204.86' />
@@ -161,16 +171,6 @@
 <text x='394.50' y='53.14' style='font-size: 11.00px; font-family: sans;' textLength='45.86px' lengthAdjust='spacingAndGlyphs'>By: fac; 2</text>
 <text x='394.50' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjMuNjd8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjMuNjd8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU4LjE5fDMzNC43N3w1MzkuNjM='>
     <rect x='43.65' y='334.77' width='314.54' height='204.86' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-simple-multi-smooth-am-with-fixed-scales.svg b/tests/testthat/_snaps/draw-methods/draw-simple-multi-smooth-am-with-fixed-scales.svg
index 6db9ae9e1..13a225bf2 100644
--- a/tests/testthat/_snaps/draw-methods/draw-simple-multi-smooth-am-with-fixed-scales.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-simple-multi-smooth-am-with-fixed-scales.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDQ1LjU3fDI1Mi40MA=='>
     <rect x='36.31' y='45.57' width='318.21' height='206.84' />
@@ -89,16 +119,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='354.52' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkwLjgzfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='390.83' y='45.57' width='318.21' height='206.84' />
@@ -149,16 +169,6 @@
 <text x='390.83' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDMxOS40NHw1MjYuMjc='>
     <rect x='36.31' y='319.44' width='318.21' height='206.84' />
@@ -209,16 +219,6 @@
 <text x='36.31' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='354.52' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkwLjgzfDcwOS4wNHwzMTkuNDR8NTI2LjI3'>
     <rect x='390.83' y='319.44' width='318.21' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-simple-multi-smooth-am.svg b/tests/testthat/_snaps/draw-methods/draw-simple-multi-smooth-am.svg
index 49d6b94da..6719ab791 100644
--- a/tests/testthat/_snaps/draw-methods/draw-simple-multi-smooth-am.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-simple-multi-smooth-am.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDQ1LjU3fDI1Mi40MA=='>
     <rect x='36.31' y='45.57' width='314.54' height='206.84' />
@@ -93,16 +123,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='350.85' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='394.50' y='45.57' width='314.54' height='206.84' />
@@ -156,16 +176,6 @@
 <text x='394.50' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDMxOS40NHw1MjYuMjc='>
     <rect x='36.31' y='319.44' width='314.54' height='206.84' />
@@ -216,16 +226,6 @@
 <text x='36.31' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='350.85' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHwzMTkuNDR8NTI2LjI3'>
     <rect x='394.50' y='319.44' width='314.54' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-simple-partial-residuals-with-fixed-scales.svg b/tests/testthat/_snaps/draw-methods/draw-simple-partial-residuals-with-fixed-scales.svg
index 81e14e801..b9b97a072 100644
--- a/tests/testthat/_snaps/draw-methods/draw-simple-partial-residuals-with-fixed-scales.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-simple-partial-residuals-with-fixed-scales.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzguMjd8MzU0LjUyfDQ1LjU3fDI1Mi40MA=='>
     <rect x='38.27' y='45.57' width='316.25' height='206.84' />
@@ -192,16 +222,6 @@
 <text x='38.27' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='354.52' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkyLjc5fDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='392.79' y='45.57' width='316.25' height='206.84' />
@@ -355,16 +375,6 @@
 <text x='392.79' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzguMjd8MzU0LjUyfDMxOS40NHw1MjYuMjc='>
     <rect x='38.27' y='319.44' width='316.25' height='206.84' />
@@ -518,16 +528,6 @@
 <text x='38.27' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='354.52' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkyLjc5fDcwOS4wNHwzMTkuNDR8NTI2LjI3'>
     <rect x='392.79' y='319.44' width='316.25' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-simple-partial-residuals.svg b/tests/testthat/_snaps/draw-methods/draw-simple-partial-residuals.svg
index 11f495738..037b60d5a 100644
--- a/tests/testthat/_snaps/draw-methods/draw-simple-partial-residuals.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-simple-partial-residuals.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU0LjUyfDQ1LjU3fDI1Mi40MA=='>
     <rect x='43.65' y='45.57' width='310.87' height='206.84' />
@@ -192,16 +222,6 @@
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='354.52' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk4LjE3fDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='398.17' y='45.57' width='310.87' height='206.84' />
@@ -355,16 +375,6 @@
 <text x='398.17' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU0LjUyfDMxOS40NHw1MjYuMjc='>
     <rect x='43.65' y='319.44' width='310.87' height='206.84' />
@@ -518,16 +528,6 @@
 <text x='43.65' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='354.52' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk4LjE3fDcwOS4wNHwzMTkuNDR8NTI2LjI3'>
     <rect x='398.17' y='319.44' width='310.87' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-m1-rotated.svg b/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-m1-rotated.svg
index 09d83203e..aead6f99f 100644
--- a/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-m1-rotated.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-m1-rotated.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU0LjUyfDQ1LjU3fDI1NS45Ng=='>
     <rect x='43.65' y='45.57' width='310.87' height='210.39' />
@@ -85,16 +115,6 @@
 <text transform='translate(18.53,150.76) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='61.14px' lengthAdjust='spacingAndGlyphs'>Partial effect</text>
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk4LjE3fDcwOS4wNHw0NS41N3wyNTUuOTY='>
     <rect x='398.17' y='45.57' width='310.87' height='210.39' />
@@ -147,16 +167,6 @@
 <text transform='translate(373.05,150.76) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='61.14px' lengthAdjust='spacingAndGlyphs'>Partial effect</text>
 <text x='398.17' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU0LjUyfDMxOS40NHw1MjkuODM='>
     <rect x='43.65' y='319.44' width='310.87' height='210.39' />
@@ -213,16 +223,6 @@
 <text transform='translate(18.53,424.63) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='61.14px' lengthAdjust='spacingAndGlyphs'>Partial effect</text>
 <text x='43.65' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk4LjE3fDcwOS4wNHwzMTkuNDR8NTI5Ljgz'>
     <rect x='398.17' y='319.44' width='310.87' height='210.39' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-m1.svg b/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-m1.svg
index 96a7a33c7..23889446c 100644
--- a/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-m1.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-m1.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU0LjUyfDQ1LjU3fDI2NS43Ng=='>
     <rect x='43.65' y='45.57' width='310.87' height='220.20' />
@@ -85,16 +115,6 @@
 <text transform='translate(18.53,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='61.14px' lengthAdjust='spacingAndGlyphs'>Partial effect</text>
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk4LjE3fDcwOS4wNHw0NS41N3wyNjUuNzY='>
     <rect x='398.17' y='45.57' width='310.87' height='220.20' />
@@ -147,16 +167,6 @@
 <text transform='translate(373.05,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='61.14px' lengthAdjust='spacingAndGlyphs'>Partial effect</text>
 <text x='398.17' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU0LjUyfDMxOS40NHw1MzkuNjM='>
     <rect x='43.65' y='319.44' width='310.87' height='220.20' />
@@ -213,16 +223,6 @@
 <text transform='translate(18.53,429.53) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='61.14px' lengthAdjust='spacingAndGlyphs'>Partial effect</text>
 <text x='43.65' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk4LjE3fDcwOS4wNHwzMTkuNDR8NTM5LjYz'>
     <rect x='398.17' y='319.44' width='310.87' height='220.20' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-m3-fixed-scales-rotated.svg b/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-m3-fixed-scales-rotated.svg
index 50b30fe60..013c29716 100644
--- a/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-m3-fixed-scales-rotated.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-m3-fixed-scales-rotated.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDYwLjkwfDI1NS45Ng=='>
     <rect x='36.31' y='60.90' width='318.21' height='195.06' />
@@ -93,16 +123,6 @@
 <text x='36.31' y='53.14' style='font-size: 11.00px; font-family: sans;' textLength='45.86px' lengthAdjust='spacingAndGlyphs'>By: fac; 1</text>
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkwLjgzfDcwOS4wNHw2MC45MHwyNTUuOTY='>
     <rect x='390.83' y='60.90' width='318.21' height='195.06' />
@@ -157,16 +177,6 @@
 <text x='390.83' y='53.14' style='font-size: 11.00px; font-family: sans;' textLength='45.86px' lengthAdjust='spacingAndGlyphs'>By: fac; 2</text>
 <text x='390.83' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDMzNC43N3w1MjkuODM='>
     <rect x='36.31' y='334.77' width='318.21' height='195.06' />
@@ -221,16 +231,6 @@
 <text x='36.31' y='327.01' style='font-size: 11.00px; font-family: sans;' textLength='45.86px' lengthAdjust='spacingAndGlyphs'>By: fac; 3</text>
 <text x='36.31' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkwLjgzfDcwOS4wNHwzMzQuNzd8NTI5Ljgz'>
     <rect x='390.83' y='334.77' width='318.21' height='195.06' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-m3-fixed-scales.svg b/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-m3-fixed-scales.svg
index 4a21762f5..62d9f5a33 100644
--- a/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-m3-fixed-scales.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-m3-fixed-scales.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDYwLjkwfDI2NS43Ng=='>
     <rect x='36.31' y='60.90' width='318.21' height='204.86' />
@@ -93,16 +123,6 @@
 <text x='36.31' y='53.14' style='font-size: 11.00px; font-family: sans;' textLength='45.86px' lengthAdjust='spacingAndGlyphs'>By: fac; 1</text>
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkwLjgzfDcwOS4wNHw2MC45MHwyNjUuNzY='>
     <rect x='390.83' y='60.90' width='318.21' height='204.86' />
@@ -157,16 +177,6 @@
 <text x='390.83' y='53.14' style='font-size: 11.00px; font-family: sans;' textLength='45.86px' lengthAdjust='spacingAndGlyphs'>By: fac; 2</text>
 <text x='390.83' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDMzNC43N3w1MzkuNjM='>
     <rect x='36.31' y='334.77' width='318.21' height='204.86' />
@@ -221,16 +231,6 @@
 <text x='36.31' y='327.01' style='font-size: 11.00px; font-family: sans;' textLength='45.86px' lengthAdjust='spacingAndGlyphs'>By: fac; 3</text>
 <text x='36.31' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkwLjgzfDcwOS4wNHwzMzQuNzd8NTM5LjYz'>
     <rect x='390.83' y='334.77' width='318.21' height='204.86' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-m3-rotated.svg b/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-m3-rotated.svg
index 7458cdd02..c28d70110 100644
--- a/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-m3-rotated.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-m3-rotated.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU3LjU1fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='357.55' y='22.78' width='356.97' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU3LjU1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='357.55' y='22.78' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTcuNTV8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='352.07' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTcuNTV8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzU3LjU1fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='357.55' y='296.65' width='356.97' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU3LjU1fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='357.55' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzUyLjA3fDYwLjkwfDI1NS45Ng=='>
     <rect x='43.65' y='60.90' width='308.43' height='195.06' />
@@ -97,16 +127,6 @@
 <text x='43.65' y='53.14' style='font-size: 11.00px; font-family: sans;' textLength='45.86px' lengthAdjust='spacingAndGlyphs'>By: fac; 1</text>
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzU3LjU1fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='357.55' y='22.78' width='356.97' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU3LjU1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='357.55' y='22.78' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDAwLjYyfDcwOS4wNHw2MC45MHwyNTUuOTY='>
     <rect x='400.62' y='60.90' width='308.43' height='195.06' />
@@ -161,16 +181,6 @@
 <text x='400.62' y='53.14' style='font-size: 11.00px; font-family: sans;' textLength='45.86px' lengthAdjust='spacingAndGlyphs'>By: fac; 2</text>
 <text x='400.62' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTcuNTV8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='352.07' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTcuNTV8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzUyLjA3fDMzNC43N3w1MjkuODM='>
     <rect x='43.65' y='334.77' width='308.43' height='195.06' />
@@ -225,16 +235,6 @@
 <text x='43.65' y='327.01' style='font-size: 11.00px; font-family: sans;' textLength='45.86px' lengthAdjust='spacingAndGlyphs'>By: fac; 3</text>
 <text x='43.65' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzU3LjU1fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='357.55' y='296.65' width='356.97' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU3LjU1fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='357.55' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDAwLjYyfDcwOS4wNHwzMzQuNzd8NTI5Ljgz'>
     <rect x='400.62' y='334.77' width='308.43' height='195.06' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-m3.svg b/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-m3.svg
index ae80a1f46..a112e5ed5 100644
--- a/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-m3.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-m3.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU3LjU1fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='357.55' y='22.78' width='356.97' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU3LjU1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='357.55' y='22.78' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTcuNTV8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='352.07' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTcuNTV8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzU3LjU1fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='357.55' y='296.65' width='356.97' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU3LjU1fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='357.55' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzUyLjA3fDYwLjkwfDI2NS43Ng=='>
     <rect x='43.65' y='60.90' width='308.43' height='204.86' />
@@ -97,16 +127,6 @@
 <text x='43.65' y='53.14' style='font-size: 11.00px; font-family: sans;' textLength='45.86px' lengthAdjust='spacingAndGlyphs'>By: fac; 1</text>
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzU3LjU1fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='357.55' y='22.78' width='356.97' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU3LjU1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='357.55' y='22.78' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDAwLjYyfDcwOS4wNHw2MC45MHwyNjUuNzY='>
     <rect x='400.62' y='60.90' width='308.43' height='204.86' />
@@ -161,16 +181,6 @@
 <text x='400.62' y='53.14' style='font-size: 11.00px; font-family: sans;' textLength='45.86px' lengthAdjust='spacingAndGlyphs'>By: fac; 2</text>
 <text x='400.62' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTcuNTV8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='352.07' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTcuNTV8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzUyLjA3fDMzNC43N3w1MzkuNjM='>
     <rect x='43.65' y='334.77' width='308.43' height='204.86' />
@@ -225,16 +235,6 @@
 <text x='43.65' y='327.01' style='font-size: 11.00px; font-family: sans;' textLength='45.86px' lengthAdjust='spacingAndGlyphs'>By: fac; 3</text>
 <text x='43.65' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzU3LjU1fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='357.55' y='296.65' width='356.97' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU3LjU1fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='357.55' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDAwLjYyfDcwOS4wNHwzMzQuNzd8NTM5LjYz'>
     <rect x='400.62' y='334.77' width='308.43' height='204.86' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-n-samples.svg b/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-n-samples.svg
index e1815edc1..1917e94d2 100644
--- a/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-n-samples.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-gam-n-samples.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU3LjU1fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='357.55' y='22.78' width='356.97' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU3LjU1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='357.55' y='22.78' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTcuNTV8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='352.07' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTcuNTV8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzU3LjU1fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='357.55' y='296.65' width='356.97' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU3LjU1fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='357.55' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzUyLjA3fDYwLjkwfDI2NS43Ng=='>
     <rect x='43.65' y='60.90' width='308.43' height='204.86' />
@@ -95,16 +125,6 @@
 <text x='43.65' y='53.14' style='font-size: 11.00px; font-family: sans;' textLength='45.86px' lengthAdjust='spacingAndGlyphs'>By: fac; 1</text>
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzU3LjU1fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='357.55' y='22.78' width='356.97' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU3LjU1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='357.55' y='22.78' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDAwLjYyfDcwOS4wNHw2MC45MHwyNjUuNzY='>
     <rect x='400.62' y='60.90' width='308.43' height='204.86' />
@@ -157,16 +177,6 @@
 <text x='400.62' y='53.14' style='font-size: 11.00px; font-family: sans;' textLength='45.86px' lengthAdjust='spacingAndGlyphs'>By: fac; 2</text>
 <text x='400.62' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTcuNTV8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='352.07' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTcuNTV8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzUyLjA3fDMzNC43N3w1MzkuNjM='>
     <rect x='43.65' y='334.77' width='308.43' height='204.86' />
@@ -219,16 +229,6 @@
 <text x='43.65' y='327.01' style='font-size: 11.00px; font-family: sans;' textLength='45.86px' lengthAdjust='spacingAndGlyphs'>By: fac; 3</text>
 <text x='43.65' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzU3LjU1fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='357.55' y='296.65' width='356.97' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU3LjU1fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='357.55' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDAwLjYyfDcwOS4wNHwzMzQuNzd8NTM5LjYz'>
     <rect x='400.62' y='334.77' width='308.43' height='204.86' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-m1-n-samples.svg b/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-m1-n-samples.svg
index b75bae63b..fa40df372 100644
--- a/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-m1-n-samples.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-smooth-samples-for-m1-n-samples.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU0LjUyfDQ1LjU3fDI2NS43Ng=='>
     <rect x='43.65' y='45.57' width='310.87' height='220.20' />
@@ -94,16 +124,6 @@
 <text transform='translate(18.53,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='61.14px' lengthAdjust='spacingAndGlyphs'>Partial effect</text>
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk4LjE3fDcwOS4wNHw0NS41N3wyNjUuNzY='>
     <rect x='398.17' y='45.57' width='310.87' height='220.20' />
@@ -154,16 +174,6 @@
 <text transform='translate(373.05,155.67) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='61.14px' lengthAdjust='spacingAndGlyphs'>Partial effect</text>
 <text x='398.17' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU0LjUyfDMxOS40NHw1MzkuNjM='>
     <rect x='43.65' y='319.44' width='310.87' height='220.20' />
@@ -215,16 +225,6 @@
 <text transform='translate(18.53,429.53) rotate(-90)' text-anchor='middle' style='font-size: 11.00px; font-family: sans;' textLength='61.14px' lengthAdjust='spacingAndGlyphs'>Partial effect</text>
 <text x='43.65' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk4LjE3fDcwOS4wNHwzMTkuNDR8NTM5LjYz'>
     <rect x='398.17' y='319.44' width='310.87' height='220.20' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-with-ranef-smooth-factor-by-fixed-scales.svg b/tests/testthat/_snaps/draw-methods/draw-with-ranef-smooth-factor-by-fixed-scales.svg
index 76c058886..71f03228b 100644
--- a/tests/testthat/_snaps/draw-methods/draw-with-ranef-smooth-factor-by-fixed-scales.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-with-ranef-smooth-factor-by-fixed-scales.svg
@@ -39,6 +39,56 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMjQxLjgzfDQ3OC4xN3wyMi43OHwzMDQuMzI='>
+    <rect x='241.83' y='22.78' width='236.35' height='281.54' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjQxLjgzfDQ3OC4xN3wyMi43OHwzMDQuMzI=)'>
+<rect x='241.83' y='22.78' width='236.35' height='281.54' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNDc4LjE3fDcxNC41MnwyMi43OHwzMDQuMzI='>
+    <rect x='478.17' y='22.78' width='236.35' height='281.54' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNDc4LjE3fDcxNC41MnwyMi43OHwzMDQuMzI=)'>
+<rect x='478.17' y='22.78' width='236.35' height='281.54' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwyNDEuODN8MzA0LjMyfDU3MC41Mg=='>
+    <rect x='5.48' y='304.32' width='236.35' height='266.20' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwyNDEuODN8MzA0LjMyfDU3MC41Mg==)'>
+<rect x='5.48' y='304.32' width='236.35' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMjQxLjgzfDQ3OC4xN3wzMDQuMzJ8NTcwLjUy'>
+    <rect x='241.83' y='304.32' width='236.35' height='266.20' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjQxLjgzfDQ3OC4xN3wzMDQuMzJ8NTcwLjUy)'>
+<rect x='241.83' y='304.32' width='236.35' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNDc4LjE3fDcxNC41MnwzMDQuMzJ8NTcwLjUy'>
+    <rect x='478.17' y='304.32' width='236.35' height='266.20' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNDc4LjE3fDcxNC41MnwzMDQuMzJ8NTcwLjUy)'>
+<rect x='478.17' y='304.32' width='236.35' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MjM2LjM1fDYwLjkwfDI2MC4wNw=='>
     <rect x='36.31' y='60.90' width='200.04' height='199.17' />
@@ -118,16 +168,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='45.48px' lengthAdjust='spacingAndGlyphs'>s(ranef)</text>
 <text x='236.35' y='297.01' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='83.66px' lengthAdjust='spacingAndGlyphs'>Basis: Random effect</text>
 </g>
-<defs>
-  <clipPath id='cpMjQxLjgzfDQ3OC4xN3wyMi43OHwzMDQuMzI='>
-    <rect x='241.83' y='22.78' width='236.35' height='281.54' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQxLjgzfDQ3OC4xN3wyMi43OHwzMDQuMzI=)'>
-<rect x='241.83' y='22.78' width='236.35' height='281.54' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjcyLjY2fDQ3Mi42OXw2MC45MHwyNjAuMDc='>
     <rect x='272.66' y='60.90' width='200.04' height='199.17' />
@@ -207,16 +247,6 @@
 <text x='272.66' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='45.48px' lengthAdjust='spacingAndGlyphs'>s(ranef)</text>
 <text x='472.69' y='297.01' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='83.66px' lengthAdjust='spacingAndGlyphs'>Basis: Random effect</text>
 </g>
-<defs>
-  <clipPath id='cpNDc4LjE3fDcxNC41MnwyMi43OHwzMDQuMzI='>
-    <rect x='478.17' y='22.78' width='236.35' height='281.54' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNDc4LjE3fDcxNC41MnwyMi43OHwzMDQuMzI=)'>
-<rect x='478.17' y='22.78' width='236.35' height='281.54' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTA5LjAwfDcwOS4wNHw2MC45MHwyNjAuMDc='>
     <rect x='509.00' y='60.90' width='200.04' height='199.17' />
@@ -296,16 +326,6 @@
 <text x='509.00' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='45.48px' lengthAdjust='spacingAndGlyphs'>s(ranef)</text>
 <text x='709.04' y='297.01' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='83.66px' lengthAdjust='spacingAndGlyphs'>Basis: Random effect</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwyNDEuODN8MzA0LjMyfDU3MC41Mg=='>
-    <rect x='5.48' y='304.32' width='236.35' height='266.20' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwyNDEuODN8MzA0LjMyfDU3MC41Mg==)'>
-<rect x='5.48' y='304.32' width='236.35' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MjM2LjM1fDMyNy4xMHw1MjYuMjc='>
     <rect x='36.31' y='327.10' width='200.04' height='199.17' />
@@ -367,16 +387,6 @@
 <text x='36.31' y='318.88' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='236.35' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMjQxLjgzfDQ3OC4xN3wzMDQuMzJ8NTcwLjUy'>
-    <rect x='241.83' y='304.32' width='236.35' height='266.20' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQxLjgzfDQ3OC4xN3wzMDQuMzJ8NTcwLjUy)'>
-<rect x='241.83' y='304.32' width='236.35' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjcyLjY2fDQ3Mi42OXwzMjcuMTB8NTI2LjI3'>
     <rect x='272.66' y='327.10' width='200.04' height='199.17' />
@@ -438,16 +448,6 @@
 <text x='272.66' y='318.88' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='472.69' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNDc4LjE3fDcxNC41MnwzMDQuMzJ8NTcwLjUy'>
-    <rect x='478.17' y='304.32' width='236.35' height='266.20' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNDc4LjE3fDcxNC41MnwzMDQuMzJ8NTcwLjUy)'>
-<rect x='478.17' y='304.32' width='236.35' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTA5LjAwfDcwOS4wNHwzMjcuMTB8NTI2LjI3'>
     <rect x='509.00' y='327.10' width='200.04' height='199.17' />
diff --git a/tests/testthat/_snaps/draw-methods/draw-ziplss-parametric-terms-issue-45.svg b/tests/testthat/_snaps/draw-methods/draw-ziplss-parametric-terms-issue-45.svg
index 7b759c60e..750e534fa 100644
--- a/tests/testthat/_snaps/draw-methods/draw-ziplss-parametric-terms-issue-45.svg
+++ b/tests/testthat/_snaps/draw-methods/draw-ziplss-parametric-terms-issue-45.svg
@@ -39,6 +39,16 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHw1NzAuNTI='>
+    <rect x='356.33' y='22.78' width='358.19' height='547.74' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHw1NzAuNTI=)'>
+<rect x='356.33' y='22.78' width='358.19' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDQ1LjU3fDUyNi4yNw=='>
     <rect x='36.31' y='45.57' width='314.54' height='480.70' />
@@ -96,16 +106,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='350.85' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHw1NzAuNTI='>
-    <rect x='356.33' y='22.78' width='358.19' height='547.74' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHw1NzAuNTI=)'>
-<rect x='356.33' y='22.78' width='358.19' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHw0NS41N3w1MjYuMjc='>
     <rect x='394.50' y='45.57' width='314.54' height='480.70' />
diff --git a/tests/testthat/_snaps/draw-methods/issue-73-draw-uses-fixed-scales-if-asked-for-them.svg b/tests/testthat/_snaps/draw-methods/issue-73-draw-uses-fixed-scales-if-asked-for-them.svg
index fd70b62f6..60b07c874 100644
--- a/tests/testthat/_snaps/draw-methods/issue-73-draw-uses-fixed-scales-if-asked-for-them.svg
+++ b/tests/testthat/_snaps/draw-methods/issue-73-draw-uses-fixed-scales-if-asked-for-them.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzk0LjU3fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='394.57' y='22.78' width='319.95' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzk0LjU3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='394.57' y='22.78' width='319.95' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzOTQuNTd8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='389.09' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzOTQuNTd8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='389.09' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDUuNjF8MzI5LjI1fDQ1LjU3fDI1Mi40MA=='>
     <rect x='45.61' y='45.57' width='283.64' height='206.84' />
@@ -92,16 +112,6 @@
 <text x='45.61' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='329.25' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzk0LjU3fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='394.57' y='22.78' width='319.95' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzk0LjU3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='394.57' y='22.78' width='319.95' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDI1LjQwfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='425.40' y='45.57' width='283.64' height='206.84' />
@@ -155,16 +165,6 @@
 <text x='425.40' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzOTQuNTd8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='389.09' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzOTQuNTd8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='389.09' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDUuNjF8MzI5LjI1fDMxOS40NHw1MjYuMjc='>
     <rect x='45.61' y='319.44' width='283.64' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-parametric-effects/draw-parametric-effects-m-2-fac.svg b/tests/testthat/_snaps/draw-parametric-effects/draw-parametric-effects-m-2-fac.svg
index ada25402d..fb326c9b6 100644
--- a/tests/testthat/_snaps/draw-parametric-effects/draw-parametric-effects-m-2-fac.svg
+++ b/tests/testthat/_snaps/draw-parametric-effects/draw-parametric-effects-m-2-fac.svg
@@ -39,6 +39,16 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI='>
+    <rect x='360.00' y='22.78' width='354.52' height='547.74' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI=)'>
+<rect x='360.00' y='22.78' width='354.52' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzU0LjUyfDQ1LjU3fDUyNi4yNw=='>
     <rect x='36.31' y='45.57' width='318.21' height='480.70' />
@@ -81,16 +91,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='17.61px' lengthAdjust='spacingAndGlyphs'>fac</text>
 <text x='354.52' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='24.94px' lengthAdjust='spacingAndGlyphs'>Factor</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI='>
-    <rect x='360.00' y='22.78' width='354.52' height='547.74' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHw1NzAuNTI=)'>
-<rect x='360.00' y='22.78' width='354.52' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkwLjgzfDcwOS4wNHw0NS41N3w1MjYuMjc='>
     <rect x='390.83' y='45.57' width='318.21' height='480.70' />
diff --git a/tests/testthat/_snaps/draw-parametric-effects/draw-parametric-effects-m-only-para.svg b/tests/testthat/_snaps/draw-parametric-effects/draw-parametric-effects-m-only-para.svg
index d1733f011..7a9387045 100644
--- a/tests/testthat/_snaps/draw-parametric-effects/draw-parametric-effects-m-only-para.svg
+++ b/tests/testthat/_snaps/draw-parametric-effects/draw-parametric-effects-m-only-para.svg
@@ -39,6 +39,46 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMjQxLjgzfDQ3OC4xN3wyMi43OHwyOTYuNjU='>
+    <rect x='241.83' y='22.78' width='236.35' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjQxLjgzfDQ3OC4xN3wyMi43OHwyOTYuNjU=)'>
+<rect x='241.83' y='22.78' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNDc4LjE3fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='478.17' y='22.78' width='236.35' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNDc4LjE3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='478.17' y='22.78' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwyNDEuODN8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='236.35' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwyNDEuODN8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMjQxLjgzfDQ3OC4xN3wyOTYuNjV8NTcwLjUy'>
+    <rect x='241.83' y='296.65' width='236.35' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjQxLjgzfDQ3OC4xN3wyOTYuNjV8NTcwLjUy)'>
+<rect x='241.83' y='296.65' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MjM2LjM1fDQ1LjU3fDI1Mi40MA=='>
     <rect x='43.65' y='45.57' width='192.70' height='206.84' />
@@ -81,16 +121,6 @@
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='17.61px' lengthAdjust='spacingAndGlyphs'>fac</text>
 <text x='236.35' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='24.94px' lengthAdjust='spacingAndGlyphs'>Factor</text>
 </g>
-<defs>
-  <clipPath id='cpMjQxLjgzfDQ3OC4xN3wyMi43OHwyOTYuNjU='>
-    <rect x='241.83' y='22.78' width='236.35' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQxLjgzfDQ3OC4xN3wyMi43OHwyOTYuNjU=)'>
-<rect x='241.83' y='22.78' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjgwLjAwfDQ3Mi42OXw0NS41N3wyNTIuNDA='>
     <rect x='280.00' y='45.57' width='192.70' height='206.84' />
@@ -141,16 +171,6 @@
 <text x='280.00' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='7.33px' lengthAdjust='spacingAndGlyphs'>ff</text>
 <text x='472.69' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='24.94px' lengthAdjust='spacingAndGlyphs'>Factor</text>
 </g>
-<defs>
-  <clipPath id='cpNDc4LjE3fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='478.17' y='22.78' width='236.35' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNDc4LjE3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='478.17' y='22.78' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTE2LjM0fDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='516.34' y='45.57' width='192.70' height='206.84' />
@@ -205,16 +225,6 @@
 <text x='516.34' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='13.95px' lengthAdjust='spacingAndGlyphs'>x0</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='32.77px' lengthAdjust='spacingAndGlyphs'>Numeric</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwyNDEuODN8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='236.35' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwyNDEuODN8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MjM2LjM1fDMxOS40NHw1MjYuMjc='>
     <rect x='43.65' y='319.44' width='192.70' height='206.84' />
@@ -269,16 +279,6 @@
 <text x='43.65' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='13.95px' lengthAdjust='spacingAndGlyphs'>x1</text>
 <text x='236.35' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='32.77px' lengthAdjust='spacingAndGlyphs'>Numeric</text>
 </g>
-<defs>
-  <clipPath id='cpMjQxLjgzfDQ3OC4xN3wyOTYuNjV8NTcwLjUy'>
-    <rect x='241.83' y='296.65' width='236.35' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQxLjgzfDQ3OC4xN3wyOTYuNjV8NTcwLjUy)'>
-<rect x='241.83' y='296.65' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjgwLjAwfDQ3Mi42OXwzMTkuNDR8NTI2LjI3'>
     <rect x='280.00' y='319.44' width='192.70' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-parametric-effects/draw-parametric-effects-m-para-sm.svg b/tests/testthat/_snaps/draw-parametric-effects/draw-parametric-effects-m-para-sm.svg
index ae1f7e15d..cc3676952 100644
--- a/tests/testthat/_snaps/draw-parametric-effects/draw-parametric-effects-m-para-sm.svg
+++ b/tests/testthat/_snaps/draw-parametric-effects/draw-parametric-effects-m-para-sm.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYzLjY3fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='363.67' y='22.78' width='350.85' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYzLjY3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='363.67' y='22.78' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjMuNjd8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjMuNjd8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU4LjE5fDQ1LjU3fDI1Mi40MA=='>
     <rect x='43.65' y='45.57' width='314.54' height='206.84' />
@@ -81,16 +101,6 @@
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='17.61px' lengthAdjust='spacingAndGlyphs'>fac</text>
 <text x='358.19' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='24.94px' lengthAdjust='spacingAndGlyphs'>Factor</text>
 </g>
-<defs>
-  <clipPath id='cpMzYzLjY3fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='363.67' y='22.78' width='350.85' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYzLjY3fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='363.67' y='22.78' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='394.50' y='45.57' width='314.54' height='206.84' />
@@ -141,16 +151,6 @@
 <text x='394.50' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='7.33px' lengthAdjust='spacingAndGlyphs'>ff</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='24.94px' lengthAdjust='spacingAndGlyphs'>Factor</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjMuNjd8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjMuNjd8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU4LjE5fDMxOS40NHw1MjYuMjc='>
     <rect x='43.65' y='319.44' width='314.54' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-parametric-effects/issue-219-parametric-effects.svg b/tests/testthat/_snaps/draw-parametric-effects/issue-219-parametric-effects.svg
index 7f8b7469a..1599c7afd 100644
--- a/tests/testthat/_snaps/draw-parametric-effects/issue-219-parametric-effects.svg
+++ b/tests/testthat/_snaps/draw-parametric-effects/issue-219-parametric-effects.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzk2LjUyfDcxNC41MnwyMi43OHwzMDQuMzI='>
+    <rect x='396.52' y='22.78' width='318.00' height='281.54' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzk2LjUyfDcxNC41MnwyMi43OHwzMDQuMzI=)'>
+<rect x='396.52' y='22.78' width='318.00' height='281.54' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzOTYuNTJ8MzA0LjMyfDU3MC41Mg=='>
+    <rect x='5.48' y='304.32' width='391.04' height='266.20' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzOTYuNTJ8MzA0LjMyfDU3MC41Mg==)'>
+<rect x='5.48' y='304.32' width='391.04' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzE4LjAwfDYwLjkwfDI2MC4wNw=='>
     <rect x='36.31' y='60.90' width='281.69' height='199.17' />
@@ -172,16 +192,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='40.34px' lengthAdjust='spacingAndGlyphs'>s(time)</text>
 <text x='318.00' y='297.01' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzk2LjUyfDcxNC41MnwyMi43OHwzMDQuMzI='>
-    <rect x='396.52' y='22.78' width='318.00' height='281.54' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzk2LjUyfDcxNC41MnwyMi43OHwzMDQuMzI=)'>
-<rect x='396.52' y='22.78' width='318.00' height='281.54' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDI3LjM1fDcwOS4wNHw2MC45MHwyNjAuMDc='>
     <rect x='427.35' y='60.90' width='281.69' height='199.17' />
@@ -580,16 +590,6 @@
 <text x='427.35' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='57.23px' lengthAdjust='spacingAndGlyphs'>s(subject)</text>
 <text x='709.04' y='297.01' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='83.66px' lengthAdjust='spacingAndGlyphs'>Basis: Random effect</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzOTYuNTJ8MzA0LjMyfDU3MC41Mg=='>
-    <rect x='5.48' y='304.32' width='391.04' height='266.20' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzOTYuNTJ8MzA0LjMyfDU3MC41Mg==)'>
-<rect x='5.48' y='304.32' width='391.04' height='266.20' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzE4LjAwfDMyNy4xMHw1MjYuMjc='>
     <rect x='36.31' y='327.10' width='281.69' height='199.17' />
diff --git a/tests/testthat/_snaps/draw-parametric-effects/ziplss-with-both-parametric-not-plotted.svg b/tests/testthat/_snaps/draw-parametric-effects/ziplss-with-both-parametric-not-plotted.svg
index 4c2ffc3c8..ee8324133 100644
--- a/tests/testthat/_snaps/draw-parametric-effects/ziplss-with-both-parametric-not-plotted.svg
+++ b/tests/testthat/_snaps/draw-parametric-effects/ziplss-with-both-parametric-not-plotted.svg
@@ -39,6 +39,16 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzUzLjg4fDcxNC41MnwyMi43OHw1NzAuNTI='>
+    <rect x='353.88' y='22.78' width='360.64' height='547.74' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzUzLjg4fDcxNC41MnwyMi43OHw1NzAuNTI=)'>
+<rect x='353.88' y='22.78' width='360.64' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzQ4LjQwfDQ1LjU3fDUyNi4yNw=='>
     <rect x='36.31' y='45.57' width='312.09' height='480.70' />
@@ -99,16 +109,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='348.40' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzUzLjg4fDcxNC41MnwyMi43OHw1NzAuNTI='>
-    <rect x='353.88' y='22.78' width='360.64' height='547.74' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzUzLjg4fDcxNC41MnwyMi43OHw1NzAuNTI=)'>
-<rect x='353.88' y='22.78' width='360.64' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk2Ljk1fDcwOS4wNHw0NS41N3w1MjYuMjc='>
     <rect x='396.95' y='45.57' width='312.09' height='480.70' />
diff --git a/tests/testthat/_snaps/draw-parametric-effects/ziplss-with-both-parametric-plotted.svg b/tests/testthat/_snaps/draw-parametric-effects/ziplss-with-both-parametric-plotted.svg
index a04c7c826..a4f18b5c0 100644
--- a/tests/testthat/_snaps/draw-parametric-effects/ziplss-with-both-parametric-plotted.svg
+++ b/tests/testthat/_snaps/draw-parametric-effects/ziplss-with-both-parametric-plotted.svg
@@ -39,6 +39,46 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMjM2LjkzfDQ3My4yOHwyMi43OHwyOTYuNjU='>
+    <rect x='236.93' y='22.78' width='236.35' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjM2LjkzfDQ3My4yOHwyMi43OHwyOTYuNjU=)'>
+<rect x='236.93' y='22.78' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNDczLjI4fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='473.28' y='22.78' width='241.24' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNDczLjI4fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='473.28' y='22.78' width='241.24' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwyMzYuOTN8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='231.45' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwyMzYuOTN8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='231.45' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMjM2LjkzfDQ3My4yOHwyOTYuNjV8NTcwLjUy'>
+    <rect x='236.93' y='296.65' width='236.35' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjM2LjkzfDQ3My4yOHwyOTYuNjV8NTcwLjUy)'>
+<rect x='236.93' y='296.65' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MjMxLjQ1fDQ1LjU3fDI1Mi40MA=='>
     <rect x='43.65' y='45.57' width='187.80' height='206.84' />
@@ -99,16 +139,6 @@
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='231.45' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMjM2LjkzfDQ3My4yOHwyMi43OHwyOTYuNjU='>
-    <rect x='236.93' y='22.78' width='236.35' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjM2LjkzfDQ3My4yOHwyMi43OHwyOTYuNjU=)'>
-<rect x='236.93' y='22.78' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjgwLjAwfDQ2Ny44MHw0NS41N3wyNTIuNDA='>
     <rect x='280.00' y='45.57' width='187.80' height='206.84' />
@@ -166,16 +196,6 @@
 <text x='280.00' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='40.35px' lengthAdjust='spacingAndGlyphs'>s.1(x0)</text>
 <text x='467.80' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNDczLjI4fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='473.28' y='22.78' width='241.24' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNDczLjI4fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='473.28' y='22.78' width='241.24' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTIxLjI0fDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='521.24' y='45.57' width='187.80' height='206.84' />
@@ -232,16 +252,6 @@
 <text x='521.24' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='24.96px' lengthAdjust='spacingAndGlyphs'>x1.1</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='32.77px' lengthAdjust='spacingAndGlyphs'>Numeric</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwyMzYuOTN8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='231.45' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwyMzYuOTN8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='231.45' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MjMxLjQ1fDMxOS40NHw1MjYuMjc='>
     <rect x='43.65' y='319.44' width='187.80' height='206.84' />
@@ -295,16 +305,6 @@
 <text x='43.65' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='13.95px' lengthAdjust='spacingAndGlyphs'>x3</text>
 <text x='231.45' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='32.77px' lengthAdjust='spacingAndGlyphs'>Numeric</text>
 </g>
-<defs>
-  <clipPath id='cpMjM2LjkzfDQ3My4yOHwyOTYuNjV8NTcwLjUy'>
-    <rect x='236.93' y='296.65' width='236.35' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjM2LjkzfDQ3My4yOHwyOTYuNjV8NTcwLjUy)'>
-<rect x='236.93' y='296.65' width='236.35' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjgwLjAwfDQ2Ny44MHwzMTkuNDR8NTI2LjI3'>
     <rect x='280.00' y='319.44' width='187.80' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-parametric-effects/ziplss-with-factor-para-not-plotted.svg b/tests/testthat/_snaps/draw-parametric-effects/ziplss-with-factor-para-not-plotted.svg
index e99132736..a5678309a 100644
--- a/tests/testthat/_snaps/draw-parametric-effects/ziplss-with-factor-para-not-plotted.svg
+++ b/tests/testthat/_snaps/draw-parametric-effects/ziplss-with-factor-para-not-plotted.svg
@@ -39,6 +39,16 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzUzLjg4fDcxNC41MnwyMi43OHw1NzAuNTI='>
+    <rect x='353.88' y='22.78' width='360.64' height='547.74' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzUzLjg4fDcxNC41MnwyMi43OHw1NzAuNTI=)'>
+<rect x='353.88' y='22.78' width='360.64' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzQ4LjQwfDQ1LjU3fDUyNi4yNw=='>
     <rect x='36.31' y='45.57' width='312.09' height='480.70' />
@@ -99,16 +109,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='348.40' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzUzLjg4fDcxNC41MnwyMi43OHw1NzAuNTI='>
-    <rect x='353.88' y='22.78' width='360.64' height='547.74' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzUzLjg4fDcxNC41MnwyMi43OHw1NzAuNTI=)'>
-<rect x='353.88' y='22.78' width='360.64' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk2Ljk1fDcwOS4wNHw0NS41N3w1MjYuMjc='>
     <rect x='396.95' y='45.57' width='312.09' height='480.70' />
diff --git a/tests/testthat/_snaps/draw-parametric-effects/ziplss-with-factor-para-plotted.svg b/tests/testthat/_snaps/draw-parametric-effects/ziplss-with-factor-para-plotted.svg
index b15a6ba92..e8b3d6549 100644
--- a/tests/testthat/_snaps/draw-parametric-effects/ziplss-with-factor-para-plotted.svg
+++ b/tests/testthat/_snaps/draw-parametric-effects/ziplss-with-factor-para-plotted.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='362.45' y='22.78' width='352.07' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='362.45' y='22.78' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='356.97' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='362.45' y='296.65' width='352.07' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='362.45' y='296.65' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNTMuNDR8MzU2Ljk3fDQ1LjU3fDI1Mi40MA=='>
     <rect x='53.44' y='45.57' width='303.53' height='206.84' />
@@ -99,16 +129,6 @@
 <text x='53.44' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='356.97' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='362.45' y='22.78' width='352.07' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='362.45' y='22.78' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDA1LjUxfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='405.51' y='45.57' width='303.53' height='206.84' />
@@ -166,16 +186,6 @@
 <text x='405.51' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='40.35px' lengthAdjust='spacingAndGlyphs'>s.1(x0)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='356.97' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTMuNDR8MzU2Ljk3fDMxOS40NHw1MjYuMjc='>
     <rect x='53.44' y='319.44' width='303.53' height='206.84' />
@@ -232,16 +242,6 @@
 <text x='53.44' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='24.96px' lengthAdjust='spacingAndGlyphs'>x1.1</text>
 <text x='356.97' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='32.77px' lengthAdjust='spacingAndGlyphs'>Numeric</text>
 </g>
-<defs>
-  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='362.45' y='296.65' width='352.07' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='362.45' y='296.65' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDA1LjUxfDcwOS4wNHwzMTkuNDR8NTI2LjI3'>
     <rect x='405.51' y='319.44' width='303.53' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-parametric-effects/ziplss-with-numeric-para-not-plotted.svg b/tests/testthat/_snaps/draw-parametric-effects/ziplss-with-numeric-para-not-plotted.svg
index 07a4cfb79..1a30fc560 100644
--- a/tests/testthat/_snaps/draw-parametric-effects/ziplss-with-numeric-para-not-plotted.svg
+++ b/tests/testthat/_snaps/draw-parametric-effects/ziplss-with-numeric-para-not-plotted.svg
@@ -39,6 +39,16 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzUzLjg4fDcxNC41MnwyMi43OHw1NzAuNTI='>
+    <rect x='353.88' y='22.78' width='360.64' height='547.74' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzUzLjg4fDcxNC41MnwyMi43OHw1NzAuNTI=)'>
+<rect x='353.88' y='22.78' width='360.64' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzQ4LjQwfDQ1LjU3fDUyNi4yNw=='>
     <rect x='36.31' y='45.57' width='312.09' height='480.70' />
@@ -99,16 +109,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='348.40' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzUzLjg4fDcxNC41MnwyMi43OHw1NzAuNTI='>
-    <rect x='353.88' y='22.78' width='360.64' height='547.74' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzUzLjg4fDcxNC41MnwyMi43OHw1NzAuNTI=)'>
-<rect x='353.88' y='22.78' width='360.64' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk2Ljk1fDcwOS4wNHw0NS41N3w1MjYuMjc='>
     <rect x='396.95' y='45.57' width='312.09' height='480.70' />
diff --git a/tests/testthat/_snaps/draw-parametric-effects/ziplss-with-numeric-para-plotted.svg b/tests/testthat/_snaps/draw-parametric-effects/ziplss-with-numeric-para-plotted.svg
index c448b0b72..9893b1d7f 100644
--- a/tests/testthat/_snaps/draw-parametric-effects/ziplss-with-numeric-para-plotted.svg
+++ b/tests/testthat/_snaps/draw-parametric-effects/ziplss-with-numeric-para-plotted.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='362.45' y='22.78' width='352.07' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='362.45' y='22.78' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='356.97' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='362.45' y='296.65' width='352.07' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='362.45' y='296.65' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNTMuNDR8MzU2Ljk3fDQ1LjU3fDI1Mi40MA=='>
     <rect x='53.44' y='45.57' width='303.53' height='206.84' />
@@ -99,16 +129,6 @@
 <text x='53.44' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='356.97' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='362.45' y='22.78' width='352.07' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='362.45' y='22.78' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDA1LjUxfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='405.51' y='45.57' width='303.53' height='206.84' />
@@ -166,16 +186,6 @@
 <text x='405.51' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='40.35px' lengthAdjust='spacingAndGlyphs'>s.1(x0)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='356.97' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTMuNDR8MzU2Ljk3fDMxOS40NHw1MjYuMjc='>
     <rect x='53.44' y='319.44' width='303.53' height='206.84' />
@@ -232,16 +242,6 @@
 <text x='53.44' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='24.96px' lengthAdjust='spacingAndGlyphs'>x1.1</text>
 <text x='356.97' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='32.77px' lengthAdjust='spacingAndGlyphs'>Numeric</text>
 </g>
-<defs>
-  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='362.45' y='296.65' width='352.07' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='362.45' y='296.65' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDA1LjUxfDcwOS4wNHwzMTkuNDR8NTI2LjI3'>
     <rect x='405.51' y='319.44' width='303.53' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-smooth-estimates/draw-sm-est-grouped-by-true-ordered.svg b/tests/testthat/_snaps/draw-smooth-estimates/draw-sm-est-grouped-by-true-ordered.svg
index 16afe360d..ed77da0a5 100644
--- a/tests/testthat/_snaps/draw-smooth-estimates/draw-sm-est-grouped-by-true-ordered.svg
+++ b/tests/testthat/_snaps/draw-smooth-estimates/draw-sm-est-grouped-by-true-ordered.svg
@@ -39,6 +39,16 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzI5LjEwfDcxNC41MnwyMi43OHw1NzAuNTI='>
+    <rect x='329.10' y='22.78' width='385.42' height='547.74' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzI5LjEwfDcxNC41MnwyMi43OHw1NzAuNTI=)'>
+<rect x='329.10' y='22.78' width='385.42' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDEuMjB8MzIzLjYyfDYwLjkwfDUyNi4yNw=='>
     <rect x='41.20' y='60.90' width='282.42' height='465.37' />
@@ -85,16 +95,6 @@
 <text x='41.20' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='43.29px' lengthAdjust='spacingAndGlyphs'>s(conc)</text>
 <text x='323.62' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzI5LjEwfDcxNC41MnwyMi43OHw1NzAuNTI='>
-    <rect x='329.10' y='22.78' width='385.42' height='547.74' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzI5LjEwfDcxNC41MnwyMi43OHw1NzAuNTI=)'>
-<rect x='329.10' y='22.78' width='385.42' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzY0LjgyfDY0Ny4yNHw2MC45MHw1MjYuMjc='>
     <rect x='364.82' y='60.90' width='282.42' height='465.37' />
diff --git a/tests/testthat/_snaps/draw-smooth-estimates/draw-sm-est-grouped-by-true.svg b/tests/testthat/_snaps/draw-smooth-estimates/draw-sm-est-grouped-by-true.svg
index a1e361ffb..4dab7d89f 100644
--- a/tests/testthat/_snaps/draw-smooth-estimates/draw-sm-est-grouped-by-true.svg
+++ b/tests/testthat/_snaps/draw-smooth-estimates/draw-sm-est-grouped-by-true.svg
@@ -39,6 +39,16 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzQxLjMzfDcxNC41MnwyMi43OHw1NzAuNTI='>
+    <rect x='341.33' y='22.78' width='373.19' height='547.74' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzQxLjMzfDcxNC41MnwyMi43OHw1NzAuNTI=)'>
+<rect x='341.33' y='22.78' width='373.19' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDguNTR8MzM1Ljg1fDYwLjkwfDUyNi4yNw=='>
     <rect x='48.54' y='60.90' width='287.31' height='465.37' />
@@ -89,16 +99,6 @@
 <text x='48.54' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='335.85' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzQxLjMzfDcxNC41MnwyMi43OHw1NzAuNTI='>
-    <rect x='341.33' y='22.78' width='373.19' height='547.74' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzQxLjMzfDcxNC41MnwyMi43OHw1NzAuNTI=)'>
-<rect x='341.33' y='22.78' width='373.19' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzcyLjE2fDY1OS40N3w2MC45MHw1MjYuMjc='>
     <rect x='372.16' y='60.90' width='287.31' height='465.37' />
diff --git a/tests/testthat/_snaps/draw-smooth-estimates/draw-smooth-est-works-with-change-indicators.svg b/tests/testthat/_snaps/draw-smooth-estimates/draw-smooth-est-works-with-change-indicators.svg
index 788240abc..2207f4517 100644
--- a/tests/testthat/_snaps/draw-smooth-estimates/draw-smooth-est-works-with-change-indicators.svg
+++ b/tests/testthat/_snaps/draw-smooth-estimates/draw-smooth-est-works-with-change-indicators.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDQ1LjU3fDI1Mi40MA=='>
     <rect x='36.31' y='45.57' width='314.54' height='206.84' />
@@ -90,16 +120,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='350.85' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='394.50' y='45.57' width='314.54' height='206.84' />
@@ -150,16 +170,6 @@
 <text x='394.50' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDMxOS40NHw1MjYuMjc='>
     <rect x='36.31' y='319.44' width='314.54' height='206.84' />
@@ -217,16 +227,6 @@
 <text x='36.31' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='350.85' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHwzMTkuNDR8NTI2LjI3'>
     <rect x='394.50' y='319.44' width='314.54' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-smooth-estimates/draw-smooth-est-works-with-sizer-indicators.svg b/tests/testthat/_snaps/draw-smooth-estimates/draw-smooth-est-works-with-sizer-indicators.svg
index b05cc7e25..3e5d2af20 100644
--- a/tests/testthat/_snaps/draw-smooth-estimates/draw-smooth-est-works-with-sizer-indicators.svg
+++ b/tests/testthat/_snaps/draw-smooth-estimates/draw-smooth-est-works-with-sizer-indicators.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDQ1LjU3fDI1Mi40MA=='>
     <rect x='36.31' y='45.57' width='314.54' height='206.84' />
@@ -90,16 +120,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='350.85' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='356.33' y='22.78' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='356.33' y='22.78' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='394.50' y='45.57' width='314.54' height='206.84' />
@@ -150,16 +170,6 @@
 <text x='394.50' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='350.85' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTYuMzN8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='350.85' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8MzUwLjg1fDMxOS40NHw1MjYuMjc='>
     <rect x='36.31' y='319.44' width='314.54' height='206.84' />
@@ -217,16 +227,6 @@
 <text x='36.31' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='350.85' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='356.33' y='296.65' width='358.19' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzU2LjMzfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='356.33' y='296.65' width='358.19' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk0LjUwfDcwOS4wNHwzMTkuNDR8NTI2LjI3'>
     <rect x='394.50' y='319.44' width='314.54' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-smooth-estimates/draw-smooth-estimates-sz-factor-smooth.svg b/tests/testthat/_snaps/draw-smooth-estimates/draw-smooth-estimates-sz-factor-smooth.svg
index ca3bb59ca..bd2d9d457 100644
--- a/tests/testthat/_snaps/draw-smooth-estimates/draw-smooth-estimates-sz-factor-smooth.svg
+++ b/tests/testthat/_snaps/draw-smooth-estimates/draw-smooth-estimates-sz-factor-smooth.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMjIxLjIyfDQ4Ni41NHwyMi43OHw1NzAuNTI='>
+    <rect x='221.22' y='22.78' width='265.32' height='547.74' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjIxLjIyfDQ4Ni41NHwyMi43OHw1NzAuNTI=)'>
+<rect x='221.22' y='22.78' width='265.32' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNDg2LjU0fDcxNC41MnwyMi43OHw1NzAuNTI='>
+    <rect x='486.54' y='22.78' width='227.98' height='547.74' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNDg2LjU0fDcxNC41MnwyMi43OHw1NzAuNTI=)'>
+<rect x='486.54' y='22.78' width='227.98' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8MjE1Ljc1fDQ1LjU3fDUyNi4yNw=='>
     <rect x='36.31' y='45.57' width='179.44' height='480.70' />
@@ -97,16 +117,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='215.75' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMjIxLjIyfDQ4Ni41NHwyMi43OHw1NzAuNTI='>
-    <rect x='221.22' y='22.78' width='265.32' height='547.74' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjIxLjIyfDQ4Ni41NHwyMi43OHw1NzAuNTI=)'>
-<rect x='221.22' y='22.78' width='265.32' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjUyLjA1fDQzMS40OXw0NS41N3w1MjYuMjc='>
     <rect x='252.05' y='45.57' width='179.44' height='480.70' />
@@ -182,16 +192,6 @@
 <text x='252.05' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='50.62px' lengthAdjust='spacingAndGlyphs'>s(fac,x2)</text>
 <text x='431.49' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='110.55px' lengthAdjust='spacingAndGlyphs'>Basis: Constr. factor smooth</text>
 </g>
-<defs>
-  <clipPath id='cpNDg2LjU0fDcxNC41MnwyMi43OHw1NzAuNTI='>
-    <rect x='486.54' y='22.78' width='227.98' height='547.74' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNDg2LjU0fDcxNC41MnwyMi43OHw1NzAuNTI=)'>
-<rect x='486.54' y='22.78' width='227.98' height='547.74' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTI5LjYwfDcwOS4wNHw0NS41N3w1MjYuMjc='>
     <rect x='529.60' y='45.57' width='179.44' height='480.70' />
diff --git a/tests/testthat/_snaps/draw-smooth-estimates/draw-smooth-estimates-sz-two-factor-smooth.svg b/tests/testthat/_snaps/draw-smooth-estimates/draw-smooth-estimates-sz-two-factor-smooth.svg
index f94ac7fc2..91e304318 100644
--- a/tests/testthat/_snaps/draw-smooth-estimates/draw-smooth-estimates-sz-two-factor-smooth.svg
+++ b/tests/testthat/_snaps/draw-smooth-estimates/draw-smooth-estimates-sz-two-factor-smooth.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzUwLjIxfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='350.21' y='22.78' width='364.31' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzUwLjIxfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='350.21' y='22.78' width='364.31' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNTAuMjF8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='344.73' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNTAuMjF8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='344.73' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzUwLjIxfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='350.21' y='296.65' width='364.31' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzUwLjIxfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='350.21' y='296.65' width='364.31' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzYuMzF8Mjg3LjM0fDQ1LjU3fDI1Mi40MA=='>
     <rect x='36.31' y='45.57' width='251.03' height='206.84' />
@@ -89,16 +119,6 @@
 <text x='36.31' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='22.00px' lengthAdjust='spacingAndGlyphs'>s(x)</text>
 <text x='287.34' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzUwLjIxfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='350.21' y='22.78' width='364.31' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzUwLjIxfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='350.21' y='22.78' width='364.31' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkzLjI4fDY0NC4zMXw0NS41N3wyNTIuNDA='>
     <rect x='393.28' y='45.57' width='251.03' height='206.84' />
@@ -173,16 +193,6 @@
 <text x='393.28' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='36.68px' lengthAdjust='spacingAndGlyphs'>s(f1,x)</text>
 <text x='644.31' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='110.55px' lengthAdjust='spacingAndGlyphs'>Basis: Constr. factor smooth</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNTAuMjF8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='344.73' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNTAuMjF8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='344.73' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzYuMzF8Mjg3LjM0fDMxOS40NHw1MjYuMjc='>
     <rect x='36.31' y='319.44' width='251.03' height='206.84' />
@@ -247,16 +257,6 @@
 <text x='36.31' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='36.68px' lengthAdjust='spacingAndGlyphs'>s(f2,x)</text>
 <text x='287.34' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='110.55px' lengthAdjust='spacingAndGlyphs'>Basis: Constr. factor smooth</text>
 </g>
-<defs>
-  <clipPath id='cpMzUwLjIxfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='350.21' y='296.65' width='364.31' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzUwLjIxfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='350.21' y='296.65' width='364.31' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzkzLjI4fDY0NC4zMXwzMTkuNDR8NTI2LjI3'>
     <rect x='393.28' y='319.44' width='251.03' height='206.84' />
diff --git a/tests/testthat/_snaps/draw-smooth-estimates/draw-subtitle-ordered-by-smooths.svg b/tests/testthat/_snaps/draw-smooth-estimates/draw-subtitle-ordered-by-smooths.svg
index e3f18c5b9..0458239f6 100644
--- a/tests/testthat/_snaps/draw-smooth-estimates/draw-subtitle-ordered-by-smooths.svg
+++ b/tests/testthat/_snaps/draw-smooth-estimates/draw-subtitle-ordered-by-smooths.svg
@@ -39,6 +39,116 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMTg2Ljc3fDM2Mi42OXwyMi43OHwyMDUuMzY='>
+    <rect x='186.77' y='22.78' width='175.92' height='182.58' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMTg2Ljc3fDM2Mi42OXwyMi43OHwyMDUuMzY=)'>
+<rect x='186.77' y='22.78' width='175.92' height='182.58' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYyLjY5fDUzOC42MHwyMi43OHwyMDUuMzY='>
+    <rect x='362.69' y='22.78' width='175.92' height='182.58' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYyLjY5fDUzOC42MHwyMi43OHwyMDUuMzY=)'>
+<rect x='362.69' y='22.78' width='175.92' height='182.58' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNTM4LjYwfDcxNC41MnwyMi43OHwyMDUuMzY='>
+    <rect x='538.60' y='22.78' width='175.92' height='182.58' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTM4LjYwfDcxNC41MnwyMi43OHwyMDUuMzY=)'>
+<rect x='538.60' y='22.78' width='175.92' height='182.58' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwxODYuNzd8MjA1LjM2fDM4Ny45NA=='>
+    <rect x='5.48' y='205.36' width='181.29' height='182.58' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwxODYuNzd8MjA1LjM2fDM4Ny45NA==)'>
+<rect x='5.48' y='205.36' width='181.29' height='182.58' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMTg2Ljc3fDM2Mi42OXwyMDUuMzZ8Mzg3Ljk0'>
+    <rect x='186.77' y='205.36' width='175.92' height='182.58' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMTg2Ljc3fDM2Mi42OXwyMDUuMzZ8Mzg3Ljk0)'>
+<rect x='186.77' y='205.36' width='175.92' height='182.58' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYyLjY5fDUzOC42MHwyMDUuMzZ8Mzg3Ljk0'>
+    <rect x='362.69' y='205.36' width='175.92' height='182.58' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYyLjY5fDUzOC42MHwyMDUuMzZ8Mzg3Ljk0)'>
+<rect x='362.69' y='205.36' width='175.92' height='182.58' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNTM4LjYwfDcxNC41MnwyMDUuMzZ8Mzg3Ljk0'>
+    <rect x='538.60' y='205.36' width='175.92' height='182.58' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTM4LjYwfDcxNC41MnwyMDUuMzZ8Mzg3Ljk0)'>
+<rect x='538.60' y='205.36' width='175.92' height='182.58' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwxODYuNzd8Mzg3Ljk0fDU3MC41Mg=='>
+    <rect x='5.48' y='387.94' width='181.29' height='182.58' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwxODYuNzd8Mzg3Ljk0fDU3MC41Mg==)'>
+<rect x='5.48' y='387.94' width='181.29' height='182.58' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMTg2Ljc3fDM2Mi42OXwzODcuOTR8NTcwLjUy'>
+    <rect x='186.77' y='387.94' width='175.92' height='182.58' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMTg2Ljc3fDM2Mi42OXwzODcuOTR8NTcwLjUy)'>
+<rect x='186.77' y='387.94' width='175.92' height='182.58' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYyLjY5fDUzOC42MHwzODcuOTR8NTcwLjUy'>
+    <rect x='362.69' y='387.94' width='175.92' height='182.58' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYyLjY5fDUzOC42MHwzODcuOTR8NTcwLjUy)'>
+<rect x='362.69' y='387.94' width='175.92' height='182.58' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNTM4LjYwfDcxNC41MnwzODcuOTR8NTcwLjUy'>
+    <rect x='538.60' y='387.94' width='175.92' height='182.58' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTM4LjYwfDcxNC41MnwzODcuOTR8NTcwLjUy)'>
+<rect x='538.60' y='387.94' width='175.92' height='182.58' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MTgxLjI5fDYwLjkwfDE2MS4xMQ=='>
     <rect x='43.65' y='60.90' width='137.64' height='100.21' />
@@ -85,16 +195,6 @@
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='43.29px' lengthAdjust='spacingAndGlyphs'>s(conc)</text>
 <text x='181.29' y='198.06' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMTg2Ljc3fDM2Mi42OXwyMi43OHwyMDUuMzY='>
-    <rect x='186.77' y='22.78' width='175.92' height='182.58' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMTg2Ljc3fDM2Mi42OXwyMi43OHwyMDUuMzY=)'>
-<rect x='186.77' y='22.78' width='175.92' height='182.58' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjE5LjU2fDM1Ny4yMXw2MC45MHwxNjEuMTE='>
     <rect x='219.56' y='60.90' width='137.64' height='100.21' />
@@ -146,16 +246,6 @@
 <text x='219.56' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='43.29px' lengthAdjust='spacingAndGlyphs'>s(conc)</text>
 <text x='357.21' y='198.06' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYyLjY5fDUzOC42MHwyMi43OHwyMDUuMzY='>
-    <rect x='362.69' y='22.78' width='175.92' height='182.58' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYyLjY5fDUzOC42MHwyMi43OHwyMDUuMzY=)'>
-<rect x='362.69' y='22.78' width='175.92' height='182.58' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk1LjQ4fDUzMy4xMnw2MC45MHwxNjEuMTE='>
     <rect x='395.48' y='60.90' width='137.64' height='100.21' />
@@ -210,16 +300,6 @@
 <text x='395.48' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='43.29px' lengthAdjust='spacingAndGlyphs'>s(conc)</text>
 <text x='533.12' y='198.06' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNTM4LjYwfDcxNC41MnwyMi43OHwyMDUuMzY='>
-    <rect x='538.60' y='22.78' width='175.92' height='182.58' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNTM4LjYwfDcxNC41MnwyMi43OHwyMDUuMzY=)'>
-<rect x='538.60' y='22.78' width='175.92' height='182.58' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTcxLjQwfDcwOS4wNHw2MC45MHwxNjEuMTE='>
     <rect x='571.40' y='60.90' width='137.64' height='100.21' />
@@ -272,16 +352,6 @@
 <text x='571.40' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='43.29px' lengthAdjust='spacingAndGlyphs'>s(conc)</text>
 <text x='709.04' y='198.06' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwxODYuNzd8MjA1LjM2fDM4Ny45NA=='>
-    <rect x='5.48' y='205.36' width='181.29' height='182.58' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwxODYuNzd8MjA1LjM2fDM4Ny45NA==)'>
-<rect x='5.48' y='205.36' width='181.29' height='182.58' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MTgxLjI5fDI0My40OHwzNDMuNjk='>
     <rect x='43.65' y='243.48' width='137.64' height='100.21' />
@@ -337,16 +407,6 @@
 <text x='43.65' y='219.93' style='font-size: 13.20px; font-family: sans;' textLength='43.29px' lengthAdjust='spacingAndGlyphs'>s(conc)</text>
 <text x='181.29' y='380.64' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMTg2Ljc3fDM2Mi42OXwyMDUuMzZ8Mzg3Ljk0'>
-    <rect x='186.77' y='205.36' width='175.92' height='182.58' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMTg2Ljc3fDM2Mi42OXwyMDUuMzZ8Mzg3Ljk0)'>
-<rect x='186.77' y='205.36' width='175.92' height='182.58' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjE5LjU2fDM1Ny4yMXwyNDMuNDh8MzQzLjY5'>
     <rect x='219.56' y='243.48' width='137.64' height='100.21' />
@@ -395,16 +455,6 @@
 <text x='219.56' y='219.93' style='font-size: 13.20px; font-family: sans;' textLength='43.29px' lengthAdjust='spacingAndGlyphs'>s(conc)</text>
 <text x='357.21' y='380.64' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYyLjY5fDUzOC42MHwyMDUuMzZ8Mzg3Ljk0'>
-    <rect x='362.69' y='205.36' width='175.92' height='182.58' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYyLjY5fDUzOC42MHwyMDUuMzZ8Mzg3Ljk0)'>
-<rect x='362.69' y='205.36' width='175.92' height='182.58' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk1LjQ4fDUzMy4xMnwyNDMuNDh8MzQzLjY5'>
     <rect x='395.48' y='243.48' width='137.64' height='100.21' />
@@ -463,16 +513,6 @@
 <text x='395.48' y='219.93' style='font-size: 13.20px; font-family: sans;' textLength='43.29px' lengthAdjust='spacingAndGlyphs'>s(conc)</text>
 <text x='533.12' y='380.64' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNTM4LjYwfDcxNC41MnwyMDUuMzZ8Mzg3Ljk0'>
-    <rect x='538.60' y='205.36' width='175.92' height='182.58' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNTM4LjYwfDcxNC41MnwyMDUuMzZ8Mzg3Ljk0)'>
-<rect x='538.60' y='205.36' width='175.92' height='182.58' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTcxLjQwfDcwOS4wNHwyNDMuNDh8MzQzLjY5'>
     <rect x='571.40' y='243.48' width='137.64' height='100.21' />
@@ -525,16 +565,6 @@
 <text x='571.40' y='219.93' style='font-size: 13.20px; font-family: sans;' textLength='43.29px' lengthAdjust='spacingAndGlyphs'>s(conc)</text>
 <text x='709.04' y='380.64' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwxODYuNzd8Mzg3Ljk0fDU3MC41Mg=='>
-    <rect x='5.48' y='387.94' width='181.29' height='182.58' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwxODYuNzd8Mzg3Ljk0fDU3MC41Mg==)'>
-<rect x='5.48' y='387.94' width='181.29' height='182.58' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MTgxLjI5fDQyNi4wNnw1MjYuMjc='>
     <rect x='43.65' y='426.06' width='137.64' height='100.21' />
@@ -593,16 +623,6 @@
 <text x='43.65' y='402.51' style='font-size: 13.20px; font-family: sans;' textLength='43.29px' lengthAdjust='spacingAndGlyphs'>s(conc)</text>
 <text x='181.29' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMTg2Ljc3fDM2Mi42OXwzODcuOTR8NTcwLjUy'>
-    <rect x='186.77' y='387.94' width='175.92' height='182.58' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMTg2Ljc3fDM2Mi42OXwzODcuOTR8NTcwLjUy)'>
-<rect x='186.77' y='387.94' width='175.92' height='182.58' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjE5LjU2fDM1Ny4yMXw0MjYuMDZ8NTI2LjI3'>
     <rect x='219.56' y='426.06' width='137.64' height='100.21' />
@@ -655,16 +675,6 @@
 <text x='219.56' y='402.51' style='font-size: 13.20px; font-family: sans;' textLength='43.29px' lengthAdjust='spacingAndGlyphs'>s(conc)</text>
 <text x='357.21' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYyLjY5fDUzOC42MHwzODcuOTR8NTcwLjUy'>
-    <rect x='362.69' y='387.94' width='175.92' height='182.58' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYyLjY5fDUzOC42MHwzODcuOTR8NTcwLjUy)'>
-<rect x='362.69' y='387.94' width='175.92' height='182.58' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk1LjQ4fDUzMy4xMnw0MjYuMDZ8NTI2LjI3'>
     <rect x='395.48' y='426.06' width='137.64' height='100.21' />
@@ -717,16 +727,6 @@
 <text x='395.48' y='402.51' style='font-size: 13.20px; font-family: sans;' textLength='43.29px' lengthAdjust='spacingAndGlyphs'>s(conc)</text>
 <text x='533.12' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNTM4LjYwfDcxNC41MnwzODcuOTR8NTcwLjUy'>
-    <rect x='538.60' y='387.94' width='175.92' height='182.58' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNTM4LjYwfDcxNC41MnwzODcuOTR8NTcwLjUy)'>
-<rect x='538.60' y='387.94' width='175.92' height='182.58' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTcxLjQwfDcwOS4wNHw0MjYuMDZ8NTI2LjI3'>
     <rect x='571.40' y='426.06' width='137.64' height='100.21' />
diff --git a/tests/testthat/_snaps/gjrm-methods/draw-simple-gjrm-gamlss.svg b/tests/testthat/_snaps/gjrm-methods/draw-simple-gjrm-gamlss.svg
index 73ef1b4ba..ecdaefdd8 100644
--- a/tests/testthat/_snaps/gjrm-methods/draw-simple-gjrm-gamlss.svg
+++ b/tests/testthat/_snaps/gjrm-methods/draw-simple-gjrm-gamlss.svg
@@ -39,6 +39,26 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU0LjUyfDQ1LjU3fDI1Mi40MA=='>
     <rect x='43.65' y='45.57' width='310.87' height='206.84' />
@@ -489,16 +509,6 @@
 <text x='43.65' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='354.52' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzk4LjE3fDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='398.17' y='45.57' width='310.87' height='206.84' />
@@ -955,16 +965,6 @@
 <text x='398.17' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x3)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='49.89px' lengthAdjust='spacingAndGlyphs'>Basis: TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDMuNjV8MzU0LjUyfDMxOS40NHw1MjYuMjc='>
     <rect x='43.65' y='319.44' width='310.87' height='206.84' />
diff --git a/tests/testthat/_snaps/parametric-effects/testing-issue-212.svg b/tests/testthat/_snaps/parametric-effects/testing-issue-212.svg
index 61db0a13d..61eb6e8f7 100644
--- a/tests/testthat/_snaps/parametric-effects/testing-issue-212.svg
+++ b/tests/testthat/_snaps/parametric-effects/testing-issue-212.svg
@@ -39,6 +39,46 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMjQzLjMwfDQ4NC4wNHwyMi43OHwyOTYuNjU='>
+    <rect x='243.30' y='22.78' width='240.75' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjQzLjMwfDQ4NC4wNHwyMi43OHwyOTYuNjU=)'>
+<rect x='243.30' y='22.78' width='240.75' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNDg0LjA0fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='484.04' y='22.78' width='230.48' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNDg0LjA0fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='484.04' y='22.78' width='230.48' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwyNDMuMzB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='237.82' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwyNDMuMzB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='237.82' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMjQzLjMwfDQ4NC4wNHwyOTYuNjV8NTcwLjUy'>
+    <rect x='243.30' y='296.65' width='240.75' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjQzLjMwfDQ4NC4wNHwyOTYuNjV8NTcwLjUy)'>
+<rect x='243.30' y='296.65' width='240.75' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpNDAuNzJ8MjM3LjgyfDQ1LjU3fDI1Mi40MA=='>
     <rect x='40.72' y='45.57' width='197.10' height='206.84' />
@@ -76,16 +116,6 @@
 <text x='40.72' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='17.61px' lengthAdjust='spacingAndGlyphs'>fac</text>
 <text x='237.82' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='24.94px' lengthAdjust='spacingAndGlyphs'>Factor</text>
 </g>
-<defs>
-  <clipPath id='cpMjQzLjMwfDQ4NC4wNHwyMi43OHwyOTYuNjU='>
-    <rect x='243.30' y='22.78' width='240.75' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQzLjMwfDQ4NC4wNHwyMi43OHwyOTYuNjU=)'>
-<rect x='243.30' y='22.78' width='240.75' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjgxLjQ2fDQ3OC41Nnw0NS41N3wyNTIuNDA='>
     <rect x='281.46' y='45.57' width='197.10' height='206.84' />
@@ -143,16 +173,6 @@
 <text x='281.46' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='141.23px' lengthAdjust='spacingAndGlyphs'>poly(x0, 2, raw = TRUE)</text>
 <text x='478.56' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='32.77px' lengthAdjust='spacingAndGlyphs'>Numeric</text>
 </g>
-<defs>
-  <clipPath id='cpNDg0LjA0fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='484.04' y='22.78' width='230.48' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNDg0LjA0fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='484.04' y='22.78' width='230.48' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNTExLjk0fDcwOS4wNHw0NS41N3wyNTIuNDA='>
     <rect x='511.94' y='45.57' width='197.10' height='206.84' />
@@ -205,16 +225,6 @@
 <text x='511.94' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='141.23px' lengthAdjust='spacingAndGlyphs'>poly(x1, 2, raw = TRUE)</text>
 <text x='709.04' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='32.77px' lengthAdjust='spacingAndGlyphs'>Numeric</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwyNDMuMzB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='237.82' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwyNDMuMzB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='237.82' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpNDAuNzJ8MjM3LjgyfDMxOS40NHw1MjYuMjc='>
     <rect x='40.72' y='319.44' width='197.10' height='206.84' />
@@ -275,16 +285,6 @@
 <text x='40.72' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='141.23px' lengthAdjust='spacingAndGlyphs'>poly(x2, 2, raw = TRUE)</text>
 <text x='237.82' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='32.77px' lengthAdjust='spacingAndGlyphs'>Numeric</text>
 </g>
-<defs>
-  <clipPath id='cpMjQzLjMwfDQ4NC4wNHwyOTYuNjV8NTcwLjUy'>
-    <rect x='243.30' y='296.65' width='240.75' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMjQzLjMwfDQ4NC4wNHwyOTYuNjV8NTcwLjUy)'>
-<rect x='243.30' y='296.65' width='240.75' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjgxLjQ2fDQ3OC41NnwzMTkuNDR8NTI2LjI3'>
     <rect x='281.46' y='319.44' width='197.10' height='206.84' />
diff --git a/tests/testthat/_snaps/penalty/draw-penalty-df-as-matrix-false.svg b/tests/testthat/_snaps/penalty/draw-penalty-df-as-matrix-false.svg
index d5c135581..8faa7e902 100644
--- a/tests/testthat/_snaps/penalty/draw-penalty-df-as-matrix-false.svg
+++ b/tests/testthat/_snaps/penalty/draw-penalty-df-as-matrix-false.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='362.45' y='22.78' width='352.07' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='362.45' y='22.78' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='356.97' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='362.45' y='296.65' width='352.07' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='362.45' y='296.65' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzEuMDV8Mjk3LjEzfDQ1LjU3fDI2NS4wMA=='>
     <rect x='31.05' y='45.57' width='266.07' height='219.43' />
@@ -121,16 +151,6 @@
 <text x='31.05' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='297.13' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='18.59px' lengthAdjust='spacingAndGlyphs'>CRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='362.45' y='22.78' width='352.07' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='362.45' y='22.78' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzgzLjEzfDY0OS4yMHw0NS41N3wyNjUuMDA='>
     <rect x='383.13' y='45.57' width='266.07' height='219.43' />
@@ -213,16 +233,6 @@
 <text x='383.13' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='649.20' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='31.31px' lengthAdjust='spacingAndGlyphs'>B spline</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='356.97' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzEuMDV8Mjk3LjEzfDMxOS40NHw1MzguODY='>
     <rect x='31.05' y='319.44' width='266.07' height='219.43' />
@@ -335,16 +345,6 @@
 <text x='31.05' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='297.13' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='23.47px' lengthAdjust='spacingAndGlyphs'>TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='362.45' y='296.65' width='352.07' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='362.45' y='296.65' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzgzLjEzfDY0OS4yMHwzMTkuNDR8NTM4Ljg2'>
     <rect x='383.13' y='319.44' width='266.07' height='219.43' />
diff --git a/tests/testthat/_snaps/penalty/draw-penalty-df-as-matrix-true.svg b/tests/testthat/_snaps/penalty/draw-penalty-df-as-matrix-true.svg
index 1fdcc6027..73946999d 100644
--- a/tests/testthat/_snaps/penalty/draw-penalty-df-as-matrix-true.svg
+++ b/tests/testthat/_snaps/penalty/draw-penalty-df-as-matrix-true.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='362.45' y='22.78' width='352.07' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='362.45' y='22.78' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='356.97' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='362.45' y='296.65' width='352.07' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='362.45' y='296.65' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzEuMDV8Mjk3LjEzfDQ1LjU3fDI2NS4wMA=='>
     <rect x='31.05' y='45.57' width='266.07' height='219.43' />
@@ -121,16 +151,6 @@
 <text x='31.05' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='297.13' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='18.59px' lengthAdjust='spacingAndGlyphs'>CRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='362.45' y='22.78' width='352.07' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='362.45' y='22.78' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzgzLjEzfDY0OS4yMHw0NS41N3wyNjUuMDA='>
     <rect x='383.13' y='45.57' width='266.07' height='219.43' />
@@ -213,16 +233,6 @@
 <text x='383.13' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='649.20' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='31.31px' lengthAdjust='spacingAndGlyphs'>B spline</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='356.97' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzEuMDV8Mjk3LjEzfDMxOS40NHw1MzguODY='>
     <rect x='31.05' y='319.44' width='266.07' height='219.43' />
@@ -335,16 +345,6 @@
 <text x='31.05' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='297.13' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='23.47px' lengthAdjust='spacingAndGlyphs'>TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='362.45' y='296.65' width='352.07' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='362.45' y='296.65' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzgzLjEzfDY0OS4yMHwzMTkuNDR8NTM4Ljg2'>
     <rect x='383.13' y='319.44' width='266.07' height='219.43' />
diff --git a/tests/testthat/_snaps/penalty/draw-penalty-df-issue-95-label-order.svg b/tests/testthat/_snaps/penalty/draw-penalty-df-issue-95-label-order.svg
index 9a9fc72d1..9d155d718 100644
--- a/tests/testthat/_snaps/penalty/draw-penalty-df-issue-95-label-order.svg
+++ b/tests/testthat/_snaps/penalty/draw-penalty-df-issue-95-label-order.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='362.45' y='22.78' width='352.07' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='362.45' y='22.78' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='356.97' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='362.45' y='296.65' width='352.07' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='362.45' y='296.65' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMzEuMDV8Mjk3LjEzfDQ1LjU3fDI2NS4wMA=='>
     <rect x='31.05' y='45.57' width='266.07' height='219.43' />
@@ -121,16 +151,6 @@
 <text x='31.05' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='297.13' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='18.59px' lengthAdjust='spacingAndGlyphs'>CRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='362.45' y='22.78' width='352.07' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='362.45' y='22.78' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzgzLjEzfDY0OS4yMHw0NS41N3wyNjUuMDA='>
     <rect x='383.13' y='45.57' width='266.07' height='219.43' />
@@ -213,16 +233,6 @@
 <text x='383.13' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='649.20' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='31.31px' lengthAdjust='spacingAndGlyphs'>B spline</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='356.97' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjIuNDV8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='356.97' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzEuMDV8Mjk3LjEzfDMxOS40NHw1MzguODY='>
     <rect x='31.05' y='319.44' width='266.07' height='219.43' />
@@ -335,16 +345,6 @@
 <text x='31.05' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='297.13' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='23.47px' lengthAdjust='spacingAndGlyphs'>TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='362.45' y='296.65' width='352.07' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYyLjQ1fDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='362.45' y='296.65' width='352.07' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzgzLjEzfDY0OS4yMHwzMTkuNDR8NTM4Ljg2'>
     <rect x='383.13' y='319.44' width='266.07' height='219.43' />
diff --git a/tests/testthat/_snaps/penalty/draw-penalty-df-with-multiple-smooths-normalized.svg b/tests/testthat/_snaps/penalty/draw-penalty-df-with-multiple-smooths-normalized.svg
index c5490304f..c1a947f2e 100644
--- a/tests/testthat/_snaps/penalty/draw-penalty-df-with-multiple-smooths-normalized.svg
+++ b/tests/testthat/_snaps/penalty/draw-penalty-df-with-multiple-smooths-normalized.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMjYuMTZ8Mjk0LjY4fDQ1LjU3fDI2NS4wMA=='>
     <rect x='26.16' y='45.57' width='268.52' height='219.43' />
@@ -124,16 +154,6 @@
 <text x='26.16' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='294.68' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='23.47px' lengthAdjust='spacingAndGlyphs'>TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzgwLjY4fDY0OS4yMHw0NS41N3wyNjUuMDA='>
     <rect x='380.68' y='45.57' width='268.52' height='219.43' />
@@ -219,16 +239,6 @@
 <text x='380.68' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='649.20' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='23.47px' lengthAdjust='spacingAndGlyphs'>TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjYuMTZ8Mjk0LjY4fDMxOS40NHw1MzguODY='>
     <rect x='26.16' y='319.44' width='268.52' height='219.43' />
@@ -314,16 +324,6 @@
 <text x='26.16' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='294.68' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='23.47px' lengthAdjust='spacingAndGlyphs'>TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzgwLjY4fDY0OS4yMHwzMTkuNDR8NTM4Ljg2'>
     <rect x='380.68' y='319.44' width='268.52' height='219.43' />
diff --git a/tests/testthat/_snaps/penalty/draw-penalty-df-with-multiple-smooths.svg b/tests/testthat/_snaps/penalty/draw-penalty-df-with-multiple-smooths.svg
index 88a4ce2dc..1740c035f 100644
--- a/tests/testthat/_snaps/penalty/draw-penalty-df-with-multiple-smooths.svg
+++ b/tests/testthat/_snaps/penalty/draw-penalty-df-with-multiple-smooths.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMjYuMTZ8Mjk1LjE2fDQ1LjU3fDI2NS4wMA=='>
     <rect x='26.16' y='45.57' width='269.00' height='219.43' />
@@ -121,16 +151,6 @@
 <text x='26.16' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='295.16' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='23.47px' lengthAdjust='spacingAndGlyphs'>TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzgwLjY4fDY0OS42OHw0NS41N3wyNjUuMDA='>
     <rect x='380.68' y='45.57' width='269.00' height='219.43' />
@@ -210,16 +230,6 @@
 <text x='380.68' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='649.68' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='23.47px' lengthAdjust='spacingAndGlyphs'>TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjYuMTZ8Mjk1LjE2fDMxOS40NHw1MzguODY='>
     <rect x='26.16' y='319.44' width='269.00' height='219.43' />
@@ -302,16 +312,6 @@
 <text x='26.16' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='295.16' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='23.47px' lengthAdjust='spacingAndGlyphs'>TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzgwLjY4fDY0OS42OHwzMTkuNDR8NTM4Ljg2'>
     <rect x='380.68' y='319.44' width='269.00' height='219.43' />
diff --git a/tests/testthat/_snaps/penalty/draw-penalty-multiple-smooths-user-continuous-fill.svg b/tests/testthat/_snaps/penalty/draw-penalty-multiple-smooths-user-continuous-fill.svg
index 8e0245750..9a644ffea 100644
--- a/tests/testthat/_snaps/penalty/draw-penalty-multiple-smooths-user-continuous-fill.svg
+++ b/tests/testthat/_snaps/penalty/draw-penalty-multiple-smooths-user-continuous-fill.svg
@@ -39,6 +39,36 @@
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 </g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
+    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
+<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
+    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
+<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
+    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
+<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+</g>
 <defs>
   <clipPath id='cpMjYuMTZ8Mjk1LjE2fDQ1LjU3fDI2NS4wMA=='>
     <rect x='26.16' y='45.57' width='269.00' height='219.43' />
@@ -121,16 +151,6 @@
 <text x='26.16' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x0)</text>
 <text x='295.16' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='23.47px' lengthAdjust='spacingAndGlyphs'>TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU='>
-    <rect x='360.00' y='22.78' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyMi43OHwyOTYuNjU=)'>
-<rect x='360.00' y='22.78' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzgwLjY4fDY0OS42OHw0NS41N3wyNjUuMDA='>
     <rect x='380.68' y='45.57' width='269.00' height='219.43' />
@@ -210,16 +230,6 @@
 <text x='380.68' y='37.35' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x1)</text>
 <text x='649.68' y='289.35' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='23.47px' lengthAdjust='spacingAndGlyphs'>TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg=='>
-    <rect x='5.48' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpNS40OHwzNjAuMDB8Mjk2LjY1fDU3MC41Mg==)'>
-<rect x='5.48' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMjYuMTZ8Mjk1LjE2fDMxOS40NHw1MzguODY='>
     <rect x='26.16' y='319.44' width='269.00' height='219.43' />
@@ -302,16 +312,6 @@
 <text x='26.16' y='311.22' style='font-size: 13.20px; font-family: sans;' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>s(x2)</text>
 <text x='295.16' y='563.21' text-anchor='end' style='font-size: 8.80px; font-family: sans;' textLength='23.47px' lengthAdjust='spacingAndGlyphs'>TPRS</text>
 </g>
-<defs>
-  <clipPath id='cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy'>
-    <rect x='360.00' y='296.65' width='354.52' height='273.87' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMzYwLjAwfDcxNC41MnwyOTYuNjV8NTcwLjUy)'>
-<rect x='360.00' y='296.65' width='354.52' height='273.87' style='stroke-width: 1.07; stroke: #FFFFFF; fill: #FFFFFF;' />
-</g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-</g>
 <defs>
   <clipPath id='cpMzgwLjY4fDY0OS42OHwzMTkuNDR8NTM4Ljg2'>
     <rect x='380.68' y='319.44' width='269.00' height='219.43' />