RubyGems - kumi - Versions diffs - 0.0.25 → 0.0.26 - Mend

kumi 0.0.25 → 0.0.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (177) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +9 -0
data/README.md +70 -71
data/data/functions/agg/boolean.yaml +6 -2
data/data/functions/agg/numeric.yaml +32 -16
data/data/functions/agg/string.yaml +4 -3
data/data/functions/core/arithmetic.yaml +62 -14
data/data/functions/core/boolean.yaml +12 -6
data/data/functions/core/comparison.yaml +25 -13
data/data/functions/core/constructor.yaml +16 -8
data/data/functions/core/select.yaml +3 -1
data/data/functions/core/stencil.yaml +14 -5
data/data/functions/core/string.yaml +9 -4
data/data/kernels/ruby/agg/numeric.yaml +1 -1
data/docs/UNSAT_DETECTION.md +83 -0
data/golden/array_element/expected/nast.txt +1 -1
data/golden/array_element/expected/schema_ruby.rb +1 -1
data/golden/array_index/expected/nast.txt +7 -7
data/golden/array_index/expected/schema_ruby.rb +1 -1
data/golden/array_operations/expected/nast.txt +2 -2
data/golden/array_operations/expected/schema_ruby.rb +1 -1
data/golden/array_operations/expected/snast.txt +3 -3
data/golden/cascade_logic/expected/schema_ruby.rb +1 -1
data/golden/cascade_logic/expected/snast.txt +2 -2
data/golden/chained_fusion/expected/nast.txt +2 -2
data/golden/chained_fusion/expected/schema_ruby.rb +1 -1
data/golden/element_arrays/expected/nast.txt +2 -2
data/golden/element_arrays/expected/schema_ruby.rb +1 -1
data/golden/element_arrays/expected/snast.txt +1 -1
data/golden/empty_and_null_inputs/expected/nast.txt +3 -3
data/golden/empty_and_null_inputs/expected/schema_ruby.rb +1 -1
data/golden/function_overload/expected/ast.txt +29 -0
data/golden/function_overload/expected/input_plan.txt +4 -0
data/golden/function_overload/expected/lir_00_unoptimized.txt +18 -0
data/golden/function_overload/expected/lir_01_hoist_scalar_references.txt +18 -0
data/golden/function_overload/expected/lir_02_inlined.txt +20 -0
data/golden/function_overload/expected/lir_03_cse.txt +20 -0
data/golden/function_overload/expected/lir_04_1_loop_fusion.txt +20 -0
data/golden/function_overload/expected/lir_04_loop_invcm.txt +20 -0
data/golden/function_overload/expected/lir_06_const_prop.txt +20 -0
data/golden/function_overload/expected/nast.txt +22 -0
data/golden/function_overload/expected/schema_javascript.mjs +12 -0
data/golden/function_overload/expected/schema_ruby.rb +39 -0
data/golden/function_overload/expected/snast.txt +22 -0
data/golden/function_overload/input.json +8 -0
data/golden/function_overload/schema.kumi +19 -0
data/golden/game_of_life/expected/lir_00_unoptimized.txt +4 -4
data/golden/game_of_life/expected/lir_01_hoist_scalar_references.txt +4 -4
data/golden/game_of_life/expected/lir_02_inlined.txt +16 -16
data/golden/game_of_life/expected/lir_03_cse.txt +20 -16
data/golden/game_of_life/expected/lir_04_1_loop_fusion.txt +20 -16
data/golden/game_of_life/expected/lir_04_loop_invcm.txt +20 -16
data/golden/game_of_life/expected/lir_06_const_prop.txt +20 -16
data/golden/game_of_life/expected/nast.txt +4 -4
data/golden/game_of_life/expected/schema_javascript.mjs +4 -2
data/golden/game_of_life/expected/schema_ruby.rb +5 -3
data/golden/game_of_life/expected/snast.txt +10 -10
data/golden/hash_keys/expected/schema_ruby.rb +1 -1
data/golden/hash_value/expected/nast.txt +1 -1
data/golden/hash_value/expected/schema_ruby.rb +1 -1
data/golden/hash_value/expected/snast.txt +1 -1
data/golden/hierarchical_complex/expected/nast.txt +3 -3
data/golden/hierarchical_complex/expected/schema_ruby.rb +1 -1
data/golden/hierarchical_complex/expected/snast.txt +3 -3
data/golden/inline_rename_scope_leak/expected/nast.txt +3 -3
data/golden/inline_rename_scope_leak/expected/schema_ruby.rb +1 -1
data/golden/input_reference/expected/nast.txt +2 -2
data/golden/input_reference/expected/schema_ruby.rb +1 -1
data/golden/interleaved_fusion/expected/nast.txt +2 -2
data/golden/interleaved_fusion/expected/schema_ruby.rb +1 -1
data/golden/let_inline/expected/nast.txt +4 -4
data/golden/let_inline/expected/schema_ruby.rb +1 -1
data/golden/loop_fusion/expected/nast.txt +1 -1
data/golden/loop_fusion/expected/schema_ruby.rb +1 -1
data/golden/min_reduce_scope/expected/nast.txt +3 -3
data/golden/min_reduce_scope/expected/schema_ruby.rb +1 -1
data/golden/min_reduce_scope/expected/snast.txt +1 -1
data/golden/mixed_dimensions/expected/nast.txt +2 -2
data/golden/mixed_dimensions/expected/schema_ruby.rb +1 -1
data/golden/multirank_hoisting/expected/nast.txt +7 -7
data/golden/multirank_hoisting/expected/schema_ruby.rb +1 -1
data/golden/nested_hash/expected/nast.txt +1 -1
data/golden/nested_hash/expected/schema_ruby.rb +1 -1
data/golden/reduction_broadcast/expected/nast.txt +3 -3
data/golden/reduction_broadcast/expected/schema_ruby.rb +1 -1
data/golden/reduction_broadcast/expected/snast.txt +1 -1
data/golden/roll/expected/schema_ruby.rb +1 -1
data/golden/shift/expected/schema_ruby.rb +1 -1
data/golden/shift_2d/expected/schema_ruby.rb +1 -1
data/golden/simple_math/expected/lir_00_unoptimized.txt +1 -1
data/golden/simple_math/expected/lir_01_hoist_scalar_references.txt +1 -1
data/golden/simple_math/expected/lir_02_inlined.txt +1 -1
data/golden/simple_math/expected/lir_03_cse.txt +1 -1
data/golden/simple_math/expected/lir_04_1_loop_fusion.txt +1 -1
data/golden/simple_math/expected/lir_04_loop_invcm.txt +1 -1
data/golden/simple_math/expected/lir_06_const_prop.txt +1 -1
data/golden/simple_math/expected/nast.txt +5 -5
data/golden/simple_math/expected/schema_ruby.rb +1 -1
data/golden/simple_math/expected/snast.txt +2 -2
data/golden/streaming_basics/expected/nast.txt +8 -8
data/golden/streaming_basics/expected/schema_ruby.rb +1 -1
data/golden/streaming_basics/expected/snast.txt +1 -1
data/golden/tuples/expected/lir_00_unoptimized.txt +5 -5
data/golden/tuples/expected/lir_01_hoist_scalar_references.txt +5 -5
data/golden/tuples/expected/lir_02_inlined.txt +5 -5
data/golden/tuples/expected/lir_03_cse.txt +5 -5
data/golden/tuples/expected/lir_04_1_loop_fusion.txt +5 -5
data/golden/tuples/expected/lir_04_loop_invcm.txt +5 -5
data/golden/tuples/expected/lir_06_const_prop.txt +5 -5
data/golden/tuples/expected/nast.txt +4 -4
data/golden/tuples/expected/schema_ruby.rb +1 -1
data/golden/tuples/expected/snast.txt +6 -6
data/golden/tuples_and_arrays/expected/lir_00_unoptimized.txt +1 -1
data/golden/tuples_and_arrays/expected/lir_01_hoist_scalar_references.txt +1 -1
data/golden/tuples_and_arrays/expected/lir_02_inlined.txt +2 -2
data/golden/tuples_and_arrays/expected/lir_03_cse.txt +2 -2
data/golden/tuples_and_arrays/expected/lir_04_1_loop_fusion.txt +2 -2
data/golden/tuples_and_arrays/expected/lir_04_loop_invcm.txt +2 -2
data/golden/tuples_and_arrays/expected/lir_06_const_prop.txt +2 -2
data/golden/tuples_and_arrays/expected/nast.txt +3 -3
data/golden/tuples_and_arrays/expected/schema_ruby.rb +1 -1
data/golden/tuples_and_arrays/expected/snast.txt +2 -2
data/golden/us_tax_2024/expected/ast.txt +63 -670
data/golden/us_tax_2024/expected/input_plan.txt +8 -45
data/golden/us_tax_2024/expected/lir_00_unoptimized.txt +253 -863
data/golden/us_tax_2024/expected/lir_01_hoist_scalar_references.txt +253 -863
data/golden/us_tax_2024/expected/lir_02_inlined.txt +1215 -5139
data/golden/us_tax_2024/expected/lir_03_cse.txt +587 -2460
data/golden/us_tax_2024/expected/lir_04_1_loop_fusion.txt +632 -2480
data/golden/us_tax_2024/expected/lir_04_loop_invcm.txt +587 -2460
data/golden/us_tax_2024/expected/lir_06_const_prop.txt +587 -2460
data/golden/us_tax_2024/expected/nast.txt +123 -826
data/golden/us_tax_2024/expected/schema_javascript.mjs +127 -581
data/golden/us_tax_2024/expected/schema_ruby.rb +135 -610
data/golden/us_tax_2024/expected/snast.txt +155 -858
data/golden/us_tax_2024/expected.json +120 -1
data/golden/us_tax_2024/input.json +18 -9
data/golden/us_tax_2024/schema.kumi +48 -178
data/golden/with_constants/expected/lir_00_unoptimized.txt +1 -1
data/golden/with_constants/expected/lir_01_hoist_scalar_references.txt +1 -1
data/golden/with_constants/expected/lir_02_inlined.txt +1 -1
data/golden/with_constants/expected/lir_03_cse.txt +1 -1
data/golden/with_constants/expected/lir_04_1_loop_fusion.txt +1 -1
data/golden/with_constants/expected/lir_04_loop_invcm.txt +1 -1
data/golden/with_constants/expected/lir_06_const_prop.txt +1 -1
data/golden/with_constants/expected/nast.txt +2 -2
data/golden/with_constants/expected/schema_ruby.rb +1 -1
data/golden/with_constants/expected/snast.txt +2 -2
data/lib/kumi/analyzer.rb +12 -12
data/lib/kumi/core/analyzer/passes/formal_constraint_propagator.rb +236 -0
data/lib/kumi/core/analyzer/passes/input_collector.rb +22 -4
data/lib/kumi/core/analyzer/passes/nast_dimensional_analyzer_pass.rb +64 -18
data/lib/kumi/core/analyzer/passes/normalize_to_nast_pass.rb +9 -4
data/lib/kumi/core/analyzer/passes/snast_pass.rb +3 -1
data/lib/kumi/core/analyzer/passes/unsat_detector.rb +172 -198
data/lib/kumi/core/error_reporter.rb +36 -1
data/lib/kumi/core/errors.rb +33 -1
data/lib/kumi/core/functions/function_spec.rb +5 -4
data/lib/kumi/core/functions/loader.rb +17 -1
data/lib/kumi/core/functions/overload_resolver.rb +164 -0
data/lib/kumi/core/functions/type_error_reporter.rb +118 -0
data/lib/kumi/core/functions/type_rules.rb +155 -35
data/lib/kumi/core/types/inference.rb +29 -22
data/lib/kumi/core/types/normalizer.rb +29 -45
data/lib/kumi/core/types/validator.rb +16 -27
data/lib/kumi/core/types/value_objects.rb +116 -0
data/lib/kumi/core/types.rb +45 -37
data/lib/kumi/registry_v2/loader.rb +90 -0
data/lib/kumi/registry_v2.rb +18 -1
data/lib/kumi/version.rb +1 -1
metadata +21 -7
data/lib/kumi/core/analyzer/unsat_constant_evaluator.rb +0 -59
data/lib/kumi/core/atom_unsat_solver.rb +0 -396
data/lib/kumi/core/constraint_relationship_solver.rb +0 -641
data/lib/kumi/core/types/builder.rb +0 -23
data/lib/kumi/core/types/compatibility.rb +0 -96
data/lib/kumi/core/types/formatter.rb +0 -26

data/golden/us_tax_2024/expected/snast.txt CHANGED Viewed

@@ -11,105 +11,105 @@
       (InputRef local_rate key_chain=[]) :: [] -> float
     ) :: [] -> float
   ) :: [] -> float
-  (VALUE taxable_single
+  (VALUE taxable
     (Fold :agg.max
       (Tuple
         (Call :core.sub
           (InputRef income key_chain=[]) :: [] -> float
-          (InputRef fed.single.std key_chain=[]) :: [] -> float
-        ) :: [] -> float
+          (InputRef statuses.status.std key_chain=[]) :: [statuses] -> float
+        ) :: [statuses] -> float
         (Const 0) :: [] -> integer
-      ) :: [] -> tuple<float, integer>
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE lo_s
-    (InputRef fed.single.rates.bracket.lo key_chain=[]) :: [rates] -> float
-  ) :: [rates] -> float
-  (VALUE hi_s
-    (InputRef fed.single.rates.bracket.hi key_chain=[]) :: [rates] -> float
-  ) :: [rates] -> float
-  (VALUE rate_s
-    (InputRef fed.single.rates.bracket.rate key_chain=[]) :: [rates] -> float
-  ) :: [rates] -> float
+      ) :: [statuses] -> tuple<float, integer>
+    ) :: [statuses] -> float
+  ) :: [statuses] -> float
+  (VALUE lo
+    (InputRef statuses.status.rates.bracket.lo key_chain=[]) :: [statuses, rates] -> float
+  ) :: [statuses, rates] -> float
+  (VALUE hi
+    (InputRef statuses.status.rates.bracket.hi key_chain=[]) :: [statuses, rates] -> float
+  ) :: [statuses, rates] -> float
+  (VALUE rate
+    (InputRef statuses.status.rates.bracket.rate key_chain=[]) :: [statuses, rates] -> float
+  ) :: [statuses, rates] -> float
   (VALUE big_hi
     (Const 100000000000.0) :: [] -> float
   ) :: [] -> float
-  (VALUE hi_s_eff
+  (VALUE hi_eff
     (Select
       (Call :core.eq
-        (Ref hi_s) :: [rates] -> float
+        (Ref hi) :: [statuses, rates] -> float
         (Const -1) :: [] -> integer
-      ) :: [rates] -> boolean
+      ) :: [statuses, rates] -> boolean
       (Const 100000000000.0) :: [] -> float
-      (Ref hi_s) :: [rates] -> float
-    ) :: [rates] -> float
-  ) :: [rates] -> float
-  (VALUE amt_s
+      (Ref hi) :: [statuses, rates] -> float
+    ) :: [statuses, rates] -> float
+  ) :: [statuses, rates] -> float
+  (VALUE amt
     (Call :core.clamp
       (Call :core.sub
-        (Ref taxable_single) :: [] -> float
-        (Ref lo_s) :: [rates] -> float
-      ) :: [rates] -> float
+        (Ref taxable) :: [statuses] -> float
+        (Ref lo) :: [statuses, rates] -> float
+      ) :: [statuses, rates] -> float
       (Const 0) :: [] -> integer
       (Call :core.sub
-        (Ref hi_s_eff) :: [rates] -> float
-        (Ref lo_s) :: [rates] -> float
-      ) :: [rates] -> float
-    ) :: [rates] -> float
-  ) :: [rates] -> float
-  (VALUE fed_tax_single
+        (Ref hi_eff) :: [statuses, rates] -> float
+        (Ref lo) :: [statuses, rates] -> float
+      ) :: [statuses, rates] -> float
+    ) :: [statuses, rates] -> float
+  ) :: [statuses, rates] -> float
+  (VALUE fed_tax
     (Reduce :agg.sum over [rates]
       (Call :core.mul
-        (Ref amt_s) :: [rates] -> float
-        (Ref rate_s) :: [rates] -> float
-      ) :: [rates] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (TRAIT in_br_s
+        (Ref amt) :: [statuses, rates] -> float
+        (Ref rate) :: [statuses, rates] -> float
+      ) :: [statuses, rates] -> float
+    ) :: [statuses] -> float
+  ) :: [statuses] -> float
+  (VALUE in_br
     (Call :core.and
       (Call :core.gte
-        (Ref taxable_single) :: [] -> float
-        (Ref lo_s) :: [rates] -> float
-      ) :: [rates] -> boolean
+        (Ref taxable) :: [statuses] -> float
+        (Ref lo) :: [statuses, rates] -> float
+      ) :: [statuses, rates] -> boolean
       (Call :core.lt
-        (Ref taxable_single) :: [] -> float
-        (Ref hi_s_eff) :: [rates] -> float
-      ) :: [rates] -> boolean
-    ) :: [rates] -> boolean
-  ) :: [rates] -> boolean
-  (VALUE fed_marginal_single
+        (Ref taxable) :: [statuses] -> float
+        (Ref hi_eff) :: [statuses, rates] -> float
+      ) :: [statuses, rates] -> boolean
+    ) :: [statuses, rates] -> boolean
+  ) :: [statuses, rates] -> boolean
+  (VALUE fed_marg
     (Reduce :agg.sum over [rates]
       (Select
-        (Ref in_br_s) :: [rates] -> boolean
-        (Ref rate_s) :: [rates] -> float
+        (Ref in_br) :: [statuses, rates] -> boolean
+        (Ref rate) :: [statuses, rates] -> float
         (Const 0) :: [] -> integer
-      ) :: [rates] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE fed_eff_single
+      ) :: [statuses, rates] -> float
+    ) :: [statuses] -> float
+  ) :: [statuses] -> float
+  (VALUE fed_eff
     (Call :core.div
-      (Ref fed_tax_single) :: [] -> float
+      (Ref fed_tax) :: [statuses] -> float
       (Fold :agg.max
         (Tuple
           (InputRef income key_chain=[]) :: [] -> float
           (Const 1.0) :: [] -> float
-        ) :: [] -> tuple<float>
+        ) :: [] -> tuple<float, float>
       ) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
+    ) :: [statuses] -> float
+  ) :: [statuses] -> float
   (VALUE ss_wage_base
     (Const 168600.0) :: [] -> float
   ) :: [] -> float
   (VALUE ss_rate
     (Const 0.062) :: [] -> float
   ) :: [] -> float
-  (VALUE ss_tax_s
+  (VALUE ss_tax
     (Call :core.mul
       (Fold :agg.min
         (Tuple
           (InputRef income key_chain=[]) :: [] -> float
           (Const 168600.0) :: [] -> float
-        ) :: [] -> tuple<float>
+        ) :: [] -> tuple<float, float>
       ) :: [] -> float
       (Const 0.062) :: [] -> float
     ) :: [] -> float
@@ -117,860 +117,157 @@
   (VALUE med_base_rate
     (Const 0.0145) :: [] -> float
   ) :: [] -> float
-  (VALUE med_tax_s
+  (VALUE med_tax
     (Call :core.mul
       (InputRef income key_chain=[]) :: [] -> float
       (Const 0.0145) :: [] -> float
     ) :: [] -> float
   ) :: [] -> float
-  (VALUE addl_threshold_single
-    (Const 200000.0) :: [] -> float
-  ) :: [] -> float
   (VALUE addl_med_rate
     (Const 0.009) :: [] -> float
   ) :: [] -> float
-  (VALUE addl_med_tax_s
-    (Call :core.mul
-      (Fold :agg.max
-        (Tuple
-          (Call :core.sub
-            (InputRef income key_chain=[]) :: [] -> float
-            (Const 200000.0) :: [] -> float
-          ) :: [] -> float
-          (Const 0) :: [] -> integer
-        ) :: [] -> tuple<float, integer>
-      ) :: [] -> float
-      (Const 0.009) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE fica_tax_single
-    (Call :core.add
-      (Call :core.add
-        (Ref ss_tax_s) :: [] -> float
-        (Ref med_tax_s) :: [] -> float
-      ) :: [] -> float
-      (Ref addl_med_tax_s) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE fica_eff_single
-    (Call :core.div
-      (Ref fica_tax_single) :: [] -> float
-      (Fold :agg.max
-        (Tuple
-          (InputRef income key_chain=[]) :: [] -> float
-          (Const 1.0) :: [] -> float
-        ) :: [] -> tuple<float>
-      ) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE total_tax_single
-    (Call :core.add
-      (Call :core.add
-        (Call :core.add
-          (Ref fed_tax_single) :: [] -> float
-          (Ref fica_tax_single) :: [] -> float
-        ) :: [] -> float
-        (Ref state_tax) :: [] -> float
-      ) :: [] -> float
-      (Ref local_tax) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE total_eff_single
-    (Call :core.div
-      (Ref total_tax_single) :: [] -> float
-      (Fold :agg.max
-        (Tuple
-          (InputRef income key_chain=[]) :: [] -> float
-          (Const 1.0) :: [] -> float
-        ) :: [] -> tuple<float>
-      ) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE after_tax_single
-    (Call :core.sub
-      (InputRef income key_chain=[]) :: [] -> float
-      (Ref total_tax_single) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE take_home_single
-    (Call :core.sub
-      (Ref after_tax_single) :: [] -> float
-      (InputRef retirement_contrib key_chain=[]) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE taxable_mj
-    (Fold :agg.max
-      (Tuple
-        (Call :core.sub
-          (InputRef income key_chain=[]) :: [] -> float
-          (InputRef fed.married_joint.std key_chain=[]) :: [] -> float
-        ) :: [] -> float
-        (Const 0) :: [] -> integer
-      ) :: [] -> tuple<float, integer>
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE lo_mj
-    (InputRef fed.married_joint.rates.bracket.lo key_chain=[]) :: [rates] -> float
-  ) :: [rates] -> float
-  (VALUE hi_mj
-    (InputRef fed.married_joint.rates.bracket.hi key_chain=[]) :: [rates] -> float
-  ) :: [rates] -> float
-  (VALUE rate_mj
-    (InputRef fed.married_joint.rates.bracket.rate key_chain=[]) :: [rates] -> float
-  ) :: [rates] -> float
-  (VALUE hi_mj_eff
-    (Select
-      (Call :core.eq
-        (Ref hi_mj) :: [rates] -> float
-        (Const -1) :: [] -> integer
-      ) :: [rates] -> boolean
-      (Const 100000000000.0) :: [] -> float
-      (Ref hi_mj) :: [rates] -> float
-    ) :: [rates] -> float
-  ) :: [rates] -> float
-  (VALUE amt_mj
-    (Call :core.clamp
-      (Call :core.sub
-        (Ref taxable_mj) :: [] -> float
-        (Ref lo_mj) :: [rates] -> float
-      ) :: [rates] -> float
-      (Const 0) :: [] -> integer
-      (Call :core.sub
-        (Ref hi_mj_eff) :: [rates] -> float
-        (Ref lo_mj) :: [rates] -> float
-      ) :: [rates] -> float
-    ) :: [rates] -> float
-  ) :: [rates] -> float
-  (VALUE fed_tax_mj
-    (Reduce :agg.sum over [rates]
-      (Call :core.mul
-        (Ref amt_mj) :: [rates] -> float
-        (Ref rate_mj) :: [rates] -> float
-      ) :: [rates] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (TRAIT in_br_mj
-    (Call :core.and
-      (Call :core.gte
-        (Ref taxable_mj) :: [] -> float
-        (Ref lo_mj) :: [rates] -> float
-      ) :: [rates] -> boolean
-      (Call :core.lt
-        (Ref taxable_mj) :: [] -> float
-        (Ref hi_mj_eff) :: [rates] -> float
-      ) :: [rates] -> boolean
-    ) :: [rates] -> boolean
-  ) :: [rates] -> boolean
-  (VALUE fed_marginal_mj
-    (Reduce :agg.sum over [rates]
-      (Select
-        (Ref in_br_mj) :: [rates] -> boolean
-        (Ref rate_mj) :: [rates] -> float
-        (Const 0) :: [] -> integer
-      ) :: [rates] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE fed_eff_mj
-    (Call :core.div
-      (Ref fed_tax_mj) :: [] -> float
-      (Fold :agg.max
-        (Tuple
-          (InputRef income key_chain=[]) :: [] -> float
-          (Const 1.0) :: [] -> float
-        ) :: [] -> tuple<float>
-      ) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE ss_tax_mj
-    (Ref ss_tax_s) :: [] -> float
-  ) :: [] -> float
-  (VALUE med_tax_mj
-    (Ref med_tax_s) :: [] -> float
-  ) :: [] -> float
-  (VALUE addl_threshold_mj
-    (Const 250000.0) :: [] -> float
-  ) :: [] -> float
-  (VALUE addl_med_tax_mj
-    (Call :core.mul
-      (Fold :agg.max
-        (Tuple
-          (Call :core.sub
-            (InputRef income key_chain=[]) :: [] -> float
-            (Const 250000.0) :: [] -> float
-          ) :: [] -> float
-          (Const 0) :: [] -> integer
-        ) :: [] -> tuple<float, integer>
-      ) :: [] -> float
-      (Const 0.009) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE fica_tax_mj
-    (Call :core.add
-      (Call :core.add
-        (Ref ss_tax_mj) :: [] -> float
-        (Ref med_tax_mj) :: [] -> float
-      ) :: [] -> float
-      (Ref addl_med_tax_mj) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE fica_eff_mj
-    (Call :core.div
-      (Ref fica_tax_mj) :: [] -> float
-      (Fold :agg.max
-        (Tuple
-          (InputRef income key_chain=[]) :: [] -> float
-          (Const 1.0) :: [] -> float
-        ) :: [] -> tuple<float>
-      ) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE total_tax_mj
-    (Call :core.add
-      (Call :core.add
-        (Call :core.add
-          (Ref fed_tax_mj) :: [] -> float
-          (Ref fica_tax_mj) :: [] -> float
-        ) :: [] -> float
-        (Ref state_tax) :: [] -> float
-      ) :: [] -> float
-      (Ref local_tax) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE total_eff_mj
-    (Call :core.div
-      (Ref total_tax_mj) :: [] -> float
-      (Fold :agg.max
-        (Tuple
-          (InputRef income key_chain=[]) :: [] -> float
-          (Const 1.0) :: [] -> float
-        ) :: [] -> tuple<float>
-      ) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE after_tax_mj
-    (Call :core.sub
-      (InputRef income key_chain=[]) :: [] -> float
-      (Ref total_tax_mj) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE take_home_mj
-    (Call :core.sub
-      (Ref after_tax_mj) :: [] -> float
-      (InputRef retirement_contrib key_chain=[]) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE taxable_ms
-    (Fold :agg.max
-      (Tuple
-        (Call :core.sub
-          (InputRef income key_chain=[]) :: [] -> float
-          (InputRef fed.married_separate.std key_chain=[]) :: [] -> float
-        ) :: [] -> float
-        (Const 0) :: [] -> integer
-      ) :: [] -> tuple<float, integer>
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE lo_ms
-    (InputRef fed.married_separate.rates.bracket.lo key_chain=[]) :: [rates] -> float
-  ) :: [rates] -> float
-  (VALUE hi_ms
-    (InputRef fed.married_separate.rates.bracket.hi key_chain=[]) :: [rates] -> float
-  ) :: [rates] -> float
-  (VALUE rate_ms
-    (InputRef fed.married_separate.rates.bracket.rate key_chain=[]) :: [rates] -> float
-  ) :: [rates] -> float
-  (VALUE hi_ms_eff
-    (Select
-      (Call :core.eq
-        (Ref hi_ms) :: [rates] -> float
-        (Const -1) :: [] -> integer
-      ) :: [rates] -> boolean
-      (Const 100000000000.0) :: [] -> float
-      (Ref hi_ms) :: [rates] -> float
-    ) :: [rates] -> float
-  ) :: [rates] -> float
-  (VALUE amt_ms
-    (Call :core.clamp
-      (Call :core.sub
-        (Ref taxable_ms) :: [] -> float
-        (Ref lo_ms) :: [rates] -> float
-      ) :: [rates] -> float
-      (Const 0) :: [] -> integer
-      (Call :core.sub
-        (Ref hi_ms_eff) :: [rates] -> float
-        (Ref lo_ms) :: [rates] -> float
-      ) :: [rates] -> float
-    ) :: [rates] -> float
-  ) :: [rates] -> float
-  (VALUE fed_tax_ms
-    (Reduce :agg.sum over [rates]
-      (Call :core.mul
-        (Ref amt_ms) :: [rates] -> float
-        (Ref rate_ms) :: [rates] -> float
-      ) :: [rates] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (TRAIT in_br_ms
-    (Call :core.and
-      (Call :core.gte
-        (Ref taxable_ms) :: [] -> float
-        (Ref lo_ms) :: [rates] -> float
-      ) :: [rates] -> boolean
-      (Call :core.lt
-        (Ref taxable_ms) :: [] -> float
-        (Ref hi_ms_eff) :: [rates] -> float
-      ) :: [rates] -> boolean
-    ) :: [rates] -> boolean
-  ) :: [rates] -> boolean
-  (VALUE fed_marginal_ms
-    (Reduce :agg.sum over [rates]
-      (Select
-        (Ref in_br_ms) :: [rates] -> boolean
-        (Ref rate_ms) :: [rates] -> float
-        (Const 0) :: [] -> integer
-      ) :: [rates] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE fed_eff_ms
-    (Call :core.div
-      (Ref fed_tax_ms) :: [] -> float
-      (Fold :agg.max
-        (Tuple
-          (InputRef income key_chain=[]) :: [] -> float
-          (Const 1.0) :: [] -> float
-        ) :: [] -> tuple<float>
-      ) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE ss_tax_ms
-    (Ref ss_tax_s) :: [] -> float
-  ) :: [] -> float
-  (VALUE med_tax_ms
-    (Ref med_tax_s) :: [] -> float
-  ) :: [] -> float
-  (VALUE addl_threshold_ms
-    (Const 125000.0) :: [] -> float
-  ) :: [] -> float
-  (VALUE addl_med_tax_ms
+  (VALUE addl_med_tax
     (Call :core.mul
       (Fold :agg.max
         (Tuple
           (Call :core.sub
             (InputRef income key_chain=[]) :: [] -> float
-            (Const 125000.0) :: [] -> float
-          ) :: [] -> float
+            (InputRef statuses.status.addl_threshold key_chain=[]) :: [statuses] -> float
+          ) :: [statuses] -> float
           (Const 0) :: [] -> integer
-        ) :: [] -> tuple<float, integer>
-      ) :: [] -> float
+        ) :: [statuses] -> tuple<float, integer>
+      ) :: [statuses] -> float
       (Const 0.009) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE fica_tax_ms
+    ) :: [statuses] -> float
+  ) :: [statuses] -> float
+  (VALUE fica_tax
     (Call :core.add
       (Call :core.add
-        (Ref ss_tax_ms) :: [] -> float
-        (Ref med_tax_ms) :: [] -> float
+        (Ref ss_tax) :: [] -> float
+        (Ref med_tax) :: [] -> float
       ) :: [] -> float
-      (Ref addl_med_tax_ms) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE fica_eff_ms
+      (Ref addl_med_tax) :: [statuses] -> float
+    ) :: [statuses] -> float
+  ) :: [statuses] -> float
+  (VALUE fica_eff
     (Call :core.div
-      (Ref fica_tax_ms) :: [] -> float
+      (Ref fica_tax) :: [statuses] -> float
       (Fold :agg.max
         (Tuple
           (InputRef income key_chain=[]) :: [] -> float
           (Const 1.0) :: [] -> float
-        ) :: [] -> tuple<float>
+        ) :: [] -> tuple<float, float>
       ) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE total_tax_ms
+    ) :: [statuses] -> float
+  ) :: [statuses] -> float
+  (VALUE total_tax
     (Call :core.add
       (Call :core.add
         (Call :core.add
-          (Ref fed_tax_ms) :: [] -> float
-          (Ref fica_tax_ms) :: [] -> float
-        ) :: [] -> float
+          (Ref fed_tax) :: [statuses] -> float
+          (Ref fica_tax) :: [statuses] -> float
+        ) :: [statuses] -> float
         (Ref state_tax) :: [] -> float
-      ) :: [] -> float
+      ) :: [statuses] -> float
       (Ref local_tax) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE total_eff_ms
+    ) :: [statuses] -> float
+  ) :: [statuses] -> float
+  (VALUE total_eff
     (Call :core.div
-      (Ref total_tax_ms) :: [] -> float
+      (Ref total_tax) :: [statuses] -> float
       (Fold :agg.max
         (Tuple
           (InputRef income key_chain=[]) :: [] -> float
           (Const 1.0) :: [] -> float
-        ) :: [] -> tuple<float>
+        ) :: [] -> tuple<float, float>
       ) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE after_tax_ms
+    ) :: [statuses] -> float
+  ) :: [statuses] -> float
+  (VALUE after_tax
     (Call :core.sub
       (InputRef income key_chain=[]) :: [] -> float
-      (Ref total_tax_ms) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE take_home_ms
+      (Ref total_tax) :: [statuses] -> float
+    ) :: [statuses] -> float
+  ) :: [statuses] -> float
+  (VALUE take_home
     (Call :core.sub
-      (Ref after_tax_ms) :: [] -> float
+      (Ref after_tax) :: [statuses] -> float
       (InputRef retirement_contrib key_chain=[]) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE taxable_hoh
-    (Fold :agg.max
-      (Tuple
-        (Call :core.sub
-          (InputRef income key_chain=[]) :: [] -> float
-          (InputRef fed.head_of_household.std key_chain=[]) :: [] -> float
-        ) :: [] -> float
-        (Const 0) :: [] -> integer
-      ) :: [] -> tuple<float, integer>
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE lo_h
-    (InputRef fed.head_of_household.rates.bracket.lo key_chain=[]) :: [rates] -> float
-  ) :: [rates] -> float
-  (VALUE hi_h
-    (InputRef fed.head_of_household.rates.bracket.hi key_chain=[]) :: [rates] -> float
-  ) :: [rates] -> float
-  (VALUE rate_h
-    (InputRef fed.head_of_household.rates.bracket.rate key_chain=[]) :: [rates] -> float
-  ) :: [rates] -> float
-  (VALUE hi_h_eff
-    (Select
-      (Call :core.eq
-        (Ref hi_h) :: [rates] -> float
-        (Const -1) :: [] -> integer
-      ) :: [rates] -> boolean
-      (Const 100000000000.0) :: [] -> float
-      (Ref hi_h) :: [rates] -> float
-    ) :: [rates] -> float
-  ) :: [rates] -> float
-  (VALUE amt_h
-    (Call :core.clamp
-      (Call :core.sub
-        (Ref taxable_hoh) :: [] -> float
-        (Ref lo_h) :: [rates] -> float
-      ) :: [rates] -> float
-      (Const 0) :: [] -> integer
-      (Call :core.sub
-        (Ref hi_h_eff) :: [rates] -> float
-        (Ref lo_h) :: [rates] -> float
-      ) :: [rates] -> float
-    ) :: [rates] -> float
-  ) :: [rates] -> float
-  (VALUE fed_tax_hoh
-    (Reduce :agg.sum over [rates]
-      (Call :core.mul
-        (Ref amt_h) :: [rates] -> float
-        (Ref rate_h) :: [rates] -> float
-      ) :: [rates] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (TRAIT in_br_h
-    (Call :core.and
-      (Call :core.gte
-        (Ref taxable_hoh) :: [] -> float
-        (Ref lo_h) :: [rates] -> float
-      ) :: [rates] -> boolean
-      (Call :core.lt
-        (Ref taxable_hoh) :: [] -> float
-        (Ref hi_h_eff) :: [rates] -> float
-      ) :: [rates] -> boolean
-    ) :: [rates] -> boolean
-  ) :: [rates] -> boolean
-  (VALUE fed_marginal_hoh
-    (Reduce :agg.sum over [rates]
-      (Select
-        (Ref in_br_h) :: [rates] -> boolean
-        (Ref rate_h) :: [rates] -> float
-        (Const 0) :: [] -> integer
-      ) :: [rates] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE fed_eff_hoh
-    (Call :core.div
-      (Ref fed_tax_hoh) :: [] -> float
-      (Fold :agg.max
-        (Tuple
-          (InputRef income key_chain=[]) :: [] -> float
-          (Const 1.0) :: [] -> float
-        ) :: [] -> tuple<float>
-      ) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE ss_tax_h
-    (Ref ss_tax_s) :: [] -> float
-  ) :: [] -> float
-  (VALUE med_tax_h
-    (Ref med_tax_s) :: [] -> float
-  ) :: [] -> float
-  (VALUE addl_threshold_hoh
-    (Const 200000.0) :: [] -> float
-  ) :: [] -> float
-  (VALUE addl_med_tax_h
-    (Call :core.mul
-      (Fold :agg.max
-        (Tuple
-          (Call :core.sub
-            (InputRef income key_chain=[]) :: [] -> float
-            (Const 200000.0) :: [] -> float
-          ) :: [] -> float
-          (Const 0) :: [] -> integer
-        ) :: [] -> tuple<float, integer>
-      ) :: [] -> float
-      (Const 0.009) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE fica_tax_hoh
-    (Call :core.add
-      (Call :core.add
-        (Ref ss_tax_h) :: [] -> float
-        (Ref med_tax_h) :: [] -> float
-      ) :: [] -> float
-      (Ref addl_med_tax_h) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE fica_eff_hoh
-    (Call :core.div
-      (Ref fica_tax_hoh) :: [] -> float
-      (Fold :agg.max
-        (Tuple
-          (InputRef income key_chain=[]) :: [] -> float
-          (Const 1.0) :: [] -> float
-        ) :: [] -> tuple<float>
-      ) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE total_tax_hoh
-    (Call :core.add
-      (Call :core.add
-        (Call :core.add
-          (Ref fed_tax_hoh) :: [] -> float
-          (Ref fica_tax_hoh) :: [] -> float
-        ) :: [] -> float
-        (Ref state_tax) :: [] -> float
-      ) :: [] -> float
-      (Ref local_tax) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE total_eff_hoh
-    (Call :core.div
-      (Ref total_tax_hoh) :: [] -> float
-      (Fold :agg.max
-        (Tuple
-          (InputRef income key_chain=[]) :: [] -> float
-          (Const 1.0) :: [] -> float
-        ) :: [] -> tuple<float>
-      ) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE after_tax_hoh
-    (Call :core.sub
-      (InputRef income key_chain=[]) :: [] -> float
-      (Ref total_tax_hoh) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
-  (VALUE take_home_hoh
-    (Call :core.sub
-      (Ref after_tax_hoh) :: [] -> float
-      (InputRef retirement_contrib key_chain=[]) :: [] -> float
-    ) :: [] -> float
-  ) :: [] -> float
+    ) :: [statuses] -> float
+  ) :: [statuses] -> float
   (VALUE summary
     (Hash
-      (Pair single
+      (Pair filing_status
+        (InputRef statuses.status.name key_chain=[]) :: [statuses] -> string
+      ) :: [statuses] -> pair
+      (Pair federal
         (Hash
-          (Pair federal
-            (Hash
-              (Pair marginal
-                (Ref fed_marginal_single) :: [] -> float
-              ) :: [] -> pair
-              (Pair effective
-                (Ref fed_eff_single) :: [] -> float
-              ) :: [] -> pair
-              (Pair tax
-                (Ref fed_tax_single) :: [] -> float
-              ) :: [] -> pair
-            ) :: [] -> hash
-          ) :: [] -> pair
-          (Pair fica
-            (Hash
-              (Pair effective
-                (Ref fica_eff_single) :: [] -> float
-              ) :: [] -> pair
-              (Pair tax
-                (Ref fica_tax_single) :: [] -> float
-              ) :: [] -> pair
-            ) :: [] -> hash
-          ) :: [] -> pair
-          (Pair state
-            (Hash
-              (Pair marginal
-                (InputRef state_rate key_chain=[]) :: [] -> float
-              ) :: [] -> pair
-              (Pair effective
-                (InputRef state_rate key_chain=[]) :: [] -> float
-              ) :: [] -> pair
-              (Pair tax
-                (Ref state_tax) :: [] -> float
-              ) :: [] -> pair
-            ) :: [] -> hash
-          ) :: [] -> pair
-          (Pair local
-            (Hash
-              (Pair marginal
-                (InputRef local_rate key_chain=[]) :: [] -> float
-              ) :: [] -> pair
-              (Pair effective
-                (InputRef local_rate key_chain=[]) :: [] -> float
-              ) :: [] -> pair
-              (Pair tax
-                (Ref local_tax) :: [] -> float
-              ) :: [] -> pair
-            ) :: [] -> hash
-          ) :: [] -> pair
-          (Pair total
-            (Hash
-              (Pair effective
-                (Ref total_eff_single) :: [] -> float
-              ) :: [] -> pair
-              (Pair tax
-                (Ref total_tax_single) :: [] -> float
-              ) :: [] -> pair
-            ) :: [] -> hash
-          ) :: [] -> pair
-          (Pair after_tax
-            (Ref after_tax_single) :: [] -> float
-          ) :: [] -> pair
-          (Pair retirement_contrib
-            (InputRef retirement_contrib key_chain=[]) :: [] -> float
-          ) :: [] -> pair
-          (Pair take_home
-            (Ref take_home_single) :: [] -> float
-          ) :: [] -> pair
-        ) :: [] -> hash
-      ) :: [] -> pair
-      (Pair married_joint
+          (Pair marginal
+            (Ref fed_marg) :: [statuses] -> float
+          ) :: [statuses] -> pair
+          (Pair effective
+            (Ref fed_eff) :: [statuses] -> float
+          ) :: [statuses] -> pair
+          (Pair tax
+            (Ref fed_tax) :: [statuses] -> float
+          ) :: [statuses] -> pair
+        ) :: [statuses] -> hash
+      ) :: [statuses] -> pair
+      (Pair fica
         (Hash
-          (Pair federal
-            (Hash
-              (Pair marginal
-                (Ref fed_marginal_mj) :: [] -> float
-              ) :: [] -> pair
-              (Pair effective
-                (Ref fed_eff_mj) :: [] -> float
-              ) :: [] -> pair
-              (Pair tax
-                (Ref fed_tax_mj) :: [] -> float
-              ) :: [] -> pair
-            ) :: [] -> hash
-          ) :: [] -> pair
-          (Pair fica
-            (Hash
-              (Pair effective
-                (Ref fica_eff_mj) :: [] -> float
-              ) :: [] -> pair
-              (Pair tax
-                (Ref fica_tax_mj) :: [] -> float
-              ) :: [] -> pair
-            ) :: [] -> hash
-          ) :: [] -> pair
-          (Pair state
-            (Hash
-              (Pair marginal
-                (InputRef state_rate key_chain=[]) :: [] -> float
-              ) :: [] -> pair
-              (Pair effective
-                (InputRef state_rate key_chain=[]) :: [] -> float
-              ) :: [] -> pair
-              (Pair tax
-                (Ref state_tax) :: [] -> float
-              ) :: [] -> pair
-            ) :: [] -> hash
-          ) :: [] -> pair
-          (Pair local
-            (Hash
-              (Pair marginal
-                (InputRef local_rate key_chain=[]) :: [] -> float
-              ) :: [] -> pair
-              (Pair effective
-                (InputRef local_rate key_chain=[]) :: [] -> float
-              ) :: [] -> pair
-              (Pair tax
-                (Ref local_tax) :: [] -> float
-              ) :: [] -> pair
-            ) :: [] -> hash
-          ) :: [] -> pair
-          (Pair total
-            (Hash
-              (Pair effective
-                (Ref total_eff_mj) :: [] -> float
-              ) :: [] -> pair
-              (Pair tax
-                (Ref total_tax_mj) :: [] -> float
-              ) :: [] -> pair
-            ) :: [] -> hash
-          ) :: [] -> pair
-          (Pair after_tax
-            (Ref after_tax_mj) :: [] -> float
+          (Pair effective
+            (Ref fica_eff) :: [statuses] -> float
+          ) :: [statuses] -> pair
+          (Pair tax
+            (Ref fica_tax) :: [statuses] -> float
+          ) :: [statuses] -> pair
+        ) :: [statuses] -> hash
+      ) :: [statuses] -> pair
+      (Pair state
+        (Hash
+          (Pair marginal
+            (InputRef state_rate key_chain=[]) :: [] -> float
           ) :: [] -> pair
-          (Pair retirement_contrib
-            (InputRef retirement_contrib key_chain=[]) :: [] -> float
+          (Pair effective
+            (InputRef state_rate key_chain=[]) :: [] -> float
           ) :: [] -> pair
-          (Pair take_home
-            (Ref take_home_mj) :: [] -> float
+          (Pair tax
+            (Ref state_tax) :: [] -> float
           ) :: [] -> pair
         ) :: [] -> hash
       ) :: [] -> pair
-      (Pair married_separate
+      (Pair local
         (Hash
-          (Pair federal
-            (Hash
-              (Pair marginal
-                (Ref fed_marginal_ms) :: [] -> float
-              ) :: [] -> pair
-              (Pair effective
-                (Ref fed_eff_ms) :: [] -> float
-              ) :: [] -> pair
-              (Pair tax
-                (Ref fed_tax_ms) :: [] -> float
-              ) :: [] -> pair
-            ) :: [] -> hash
-          ) :: [] -> pair
-          (Pair fica
-            (Hash
-              (Pair effective
-                (Ref fica_eff_ms) :: [] -> float
-              ) :: [] -> pair
-              (Pair tax
-                (Ref fica_tax_ms) :: [] -> float
-              ) :: [] -> pair
-            ) :: [] -> hash
-          ) :: [] -> pair
-          (Pair state
-            (Hash
-              (Pair marginal
-                (InputRef state_rate key_chain=[]) :: [] -> float
-              ) :: [] -> pair
-              (Pair effective
-                (InputRef state_rate key_chain=[]) :: [] -> float
-              ) :: [] -> pair
-              (Pair tax
-                (Ref state_tax) :: [] -> float
-              ) :: [] -> pair
-            ) :: [] -> hash
-          ) :: [] -> pair
-          (Pair local
-            (Hash
-              (Pair marginal
-                (InputRef local_rate key_chain=[]) :: [] -> float
-              ) :: [] -> pair
-              (Pair effective
-                (InputRef local_rate key_chain=[]) :: [] -> float
-              ) :: [] -> pair
-              (Pair tax
-                (Ref local_tax) :: [] -> float
-              ) :: [] -> pair
-            ) :: [] -> hash
-          ) :: [] -> pair
-          (Pair total
-            (Hash
-              (Pair effective
-                (Ref total_eff_ms) :: [] -> float
-              ) :: [] -> pair
-              (Pair tax
-                (Ref total_tax_ms) :: [] -> float
-              ) :: [] -> pair
-            ) :: [] -> hash
-          ) :: [] -> pair
-          (Pair after_tax
-            (Ref after_tax_ms) :: [] -> float
+          (Pair marginal
+            (InputRef local_rate key_chain=[]) :: [] -> float
           ) :: [] -> pair
-          (Pair retirement_contrib
-            (InputRef retirement_contrib key_chain=[]) :: [] -> float
+          (Pair effective
+            (InputRef local_rate key_chain=[]) :: [] -> float
           ) :: [] -> pair
-          (Pair take_home
-            (Ref take_home_ms) :: [] -> float
+          (Pair tax
+            (Ref local_tax) :: [] -> float
           ) :: [] -> pair
         ) :: [] -> hash
       ) :: [] -> pair
-      (Pair head_of_household
+      (Pair total
         (Hash
-          (Pair federal
-            (Hash
-              (Pair marginal
-                (Ref fed_marginal_hoh) :: [] -> float
-              ) :: [] -> pair
-              (Pair effective
-                (Ref fed_eff_hoh) :: [] -> float
-              ) :: [] -> pair
-              (Pair tax
-                (Ref fed_tax_hoh) :: [] -> float
-              ) :: [] -> pair
-            ) :: [] -> hash
-          ) :: [] -> pair
-          (Pair fica
-            (Hash
-              (Pair effective
-                (Ref fica_eff_hoh) :: [] -> float
-              ) :: [] -> pair
-              (Pair tax
-                (Ref fica_tax_hoh) :: [] -> float
-              ) :: [] -> pair
-            ) :: [] -> hash
-          ) :: [] -> pair
-          (Pair state
-            (Hash
-              (Pair marginal
-                (InputRef state_rate key_chain=[]) :: [] -> float
-              ) :: [] -> pair
-              (Pair effective
-                (InputRef state_rate key_chain=[]) :: [] -> float
-              ) :: [] -> pair
-              (Pair tax
-                (Ref state_tax) :: [] -> float
-              ) :: [] -> pair
-            ) :: [] -> hash
-          ) :: [] -> pair
-          (Pair local
-            (Hash
-              (Pair marginal
-                (InputRef local_rate key_chain=[]) :: [] -> float
-              ) :: [] -> pair
-              (Pair effective
-                (InputRef local_rate key_chain=[]) :: [] -> float
-              ) :: [] -> pair
-              (Pair tax
-                (Ref local_tax) :: [] -> float
-              ) :: [] -> pair
-            ) :: [] -> hash
-          ) :: [] -> pair
-          (Pair total
-            (Hash
-              (Pair effective
-                (Ref total_eff_hoh) :: [] -> float
-              ) :: [] -> pair
-              (Pair tax
-                (Ref total_tax_hoh) :: [] -> float
-              ) :: [] -> pair
-            ) :: [] -> hash
-          ) :: [] -> pair
-          (Pair after_tax
-            (Ref after_tax_hoh) :: [] -> float
-          ) :: [] -> pair
-          (Pair retirement_contrib
-            (InputRef retirement_contrib key_chain=[]) :: [] -> float
-          ) :: [] -> pair
-          (Pair take_home
-            (Ref take_home_hoh) :: [] -> float
-          ) :: [] -> pair
-        ) :: [] -> hash
+          (Pair effective
+            (Ref total_eff) :: [statuses] -> float
+          ) :: [statuses] -> pair
+          (Pair tax
+            (Ref total_tax) :: [statuses] -> float
+          ) :: [statuses] -> pair
+        ) :: [statuses] -> hash
+      ) :: [statuses] -> pair
+      (Pair after_tax
+        (Ref after_tax) :: [statuses] -> float
+      ) :: [statuses] -> pair
+      (Pair retirement_contrib
+        (InputRef retirement_contrib key_chain=[]) :: [] -> float
       ) :: [] -> pair
-    ) :: [] -> hash
-  ) :: [] -> hash
+      (Pair take_home
+        (Ref take_home) :: [statuses] -> float
+      ) :: [statuses] -> pair
+    ) :: [statuses] -> hash
+  ) :: [statuses] -> hash
 )