diff --git a/designs/waralee/src/backpocket.mjs b/designs/waralee/src/backpocket.mjs
index 589ae97434a..040742d3de6 100644
--- a/designs/waralee/src/backpocket.mjs
+++ b/designs/waralee/src/backpocket.mjs
@@ -1,20 +1,20 @@
 import { pantsProto } from './pantsproto.mjs'
 
-function waraleeBackPocket(part) {
-  const {
-    options,
-    measurements,
-    Point,
-    Path,
-    points,
-    paths,
-    Snippet,
-    snippets,
-    complete,
-    paperless,
-    macro,
-    sa,
-  } = part.shorthand()
+function waraleeBackPocket({
+  options,
+  measurements,
+  Point,
+  Path,
+  points,
+  paths,
+  Snippet,
+  snippets,
+  complete,
+  paperless,
+  macro,
+  sa,
+  part,
+}) {
 
   if (false == options.backPocket) {
     return part
diff --git a/designs/waralee/src/cutout.mjs b/designs/waralee/src/cutout.mjs
index 9de13390929..14120c94657 100644
--- a/designs/waralee/src/cutout.mjs
+++ b/designs/waralee/src/cutout.mjs
@@ -1,8 +1,18 @@
 import { pantsProto } from './pantsproto.mjs'
 
-function waraleeCutout(part) {
-  const { options, Path, points, paths, Snippet, snippets, complete, sa, paperless, macro } =
-    part.shorthand()
+function waraleeCutout({
+  options,
+  Path,
+  points,
+  paths,
+  Snippet,
+  snippets,
+  complete,
+  sa,
+  paperless,
+  macro,
+  part,
+}) {
 
   let separateWaistband = options.separateWaistband
   if ('waistband' == options.frontPocketStyle) {
diff --git a/designs/waralee/src/facings.mjs b/designs/waralee/src/facings.mjs
index 7f00a14e9ae..c92269a6e65 100644
--- a/designs/waralee/src/facings.mjs
+++ b/designs/waralee/src/facings.mjs
@@ -1,20 +1,20 @@
 import { pantsProto } from './pantsproto.mjs'
 
-function waraleeFacings(part) {
-  const {
-    options,
-    measurements,
-    Point,
-    Path,
-    points,
-    paths,
-    Snippet,
-    snippets,
-    complete,
-    paperless,
-    macro,
-    sa,
-  } = part.shorthand()
+function waraleeFacings({
+  options,
+  measurements,
+  Point,
+  Path,
+  points,
+  paths,
+  Snippet,
+  snippets,
+  complete,
+  paperless,
+  macro,
+  sa,
+  part,
+}) {
 
   let frontPocketSize =
     options.frontPocketSize * measurements.crotchDepth /*- measurements.waistToHips*/
diff --git a/designs/waralee/src/mini.mjs b/designs/waralee/src/mini.mjs
index a496db92c72..3489c3b933f 100644
--- a/designs/waralee/src/mini.mjs
+++ b/designs/waralee/src/mini.mjs
@@ -4,8 +4,17 @@ import { pantsProto } from './pantsproto.mjs'
 // To keep you from printing it completely, you could print this part in paperless mode
 // and only have a single sheet with all the dimensions on it.
 
-function waraleeMini(part) {
-  const { options, Path, points, paths, complete, sa, macro, store } = part.shorthand()
+function waraleeMini({
+  options,
+  Path,
+  points,
+  paths,
+  complete,
+  sa,
+  macro,
+  store,
+  part,
+}) {
 
   let mini = options.minimizer
   let separateWaistband = options.separateWaistband
diff --git a/designs/waralee/src/pants.mjs b/designs/waralee/src/pants.mjs
index 4c0cae7d21e..864e8e24aa8 100644
--- a/designs/waralee/src/pants.mjs
+++ b/designs/waralee/src/pants.mjs
@@ -1,8 +1,19 @@
 import { pantsProto } from './pantsproto.mjs'
 
-function waraleePants(part) {
-  const { options, points, Path, paths, Snippet, snippets, complete, sa, paperless, macro, store } =
-    part.shorthand()
+function waraleePants({
+  options,
+  points,
+  Path,
+  paths,
+  Snippet,
+  snippets,
+  complete,
+  sa,
+  paperless,
+  macro,
+  store,
+  part,
+}) {
 
   let separateWaistband = options.separateWaistband
   if ('waistband' == options.frontPocketStyle) {
diff --git a/designs/waralee/src/pantsproto.mjs b/designs/waralee/src/pantsproto.mjs
index b58f8240d10..96fd58ba2bf 100644
--- a/designs/waralee/src/pantsproto.mjs
+++ b/designs/waralee/src/pantsproto.mjs
@@ -1,8 +1,16 @@
 import { pluginBundle } from '@freesewing/plugin-bundle'
 import * as options from './options.mjs'
 
-function waraleePantsProto(part) {
-  const { options, measurements, Point, Path, points, paths, store } = part.shorthand()
+function waraleePantsProto({
+  options,
+  measurements,
+  Point,
+  Path,
+  points,
+  paths,
+  store,
+  part,
+}) {
 
   let seatDepth =
     measurements.crotchDepth /* - measurements.waistToHips */ *
diff --git a/designs/waralee/src/pocket.mjs b/designs/waralee/src/pocket.mjs
index 5358fe8a28d..cd00dd15ca4 100644
--- a/designs/waralee/src/pocket.mjs
+++ b/designs/waralee/src/pocket.mjs
@@ -1,20 +1,20 @@
 import { pantsProto } from './pantsproto.mjs'
 
-function waraleePocket(part) {
-  const {
-    options,
-    measurements,
-    Point,
-    Path,
-    points,
-    paths,
-    Snippet,
-    snippets,
-    complete,
-    sa,
-    paperless,
-    macro,
-  } = part.shorthand()
+function waraleePocket({
+  options,
+  measurements,
+  Point,
+  Path,
+  points,
+  paths,
+  Snippet,
+  snippets,
+  complete,
+  sa,
+  paperless,
+  macro,
+  part,
+}) {
 
   if (false == options.frontPocket) {
     return part
diff --git a/designs/waralee/src/waistband.mjs b/designs/waralee/src/waistband.mjs
index 383f542be37..afc8698ea3b 100644
--- a/designs/waralee/src/waistband.mjs
+++ b/designs/waralee/src/waistband.mjs
@@ -1,21 +1,21 @@
 import { pantsProto } from './pantsproto.mjs'
 
-function waraleeWaistband(type, part) {
-  const {
-    options,
-    measurements,
-    Point,
-    Path,
-    points,
-    paths,
-    Snippet,
-    snippets,
-    complete,
-    paperless,
-    macro,
-    sa,
-    store,
-  } = part.shorthand()
+function waraleeWaistband(type, {
+  options,
+  measurements,
+  Point,
+  Path,
+  points,
+  paths,
+  Snippet,
+  snippets,
+  complete,
+  paperless,
+  macro,
+  sa,
+  store,
+  part,
+}) {
 
   const WidthReduction = 6
   let waistBand = store.get('waistBand')