diff --git a/compiler/lib/src/main/resources/META-INF/native-image/reflect-config.json b/compiler/lib/src/main/resources/META-INF/native-image/reflect-config.json
index c227102d6..b477af3e0 100644
--- a/compiler/lib/src/main/resources/META-INF/native-image/reflect-config.json
+++ b/compiler/lib/src/main/resources/META-INF/native-image/reflect-config.json
@@ -24,34 +24,7 @@
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1",
-  "fields":[
-    {"name":"0bitmap$318"}, 
-    {"name":"0bitmap$346"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1000",
-  "fields":[{"name":"0bitmap$906"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1004",
-  "fields":[{"name":"0bitmap$910"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1005",
-  "fields":[{"name":"0bitmap$908"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1006",
-  "fields":[{"name":"0bitmap$909"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1007",
-  "fields":[{"name":"0bitmap$965"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1008",
-  "fields":[{"name":"0bitmap$941"}]
+  "fields":[{"name":"0bitmap$346"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1014",
@@ -65,65 +38,21 @@
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1016",
   "fields":[{"name":"0bitmap$957"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1041",
-  "fields":[{"name":"0bitmap$960"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1042",
-  "fields":[{"name":"0bitmap$945"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1047",
-  "fields":[{"name":"0bitmap$955"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1048",
-  "fields":[{"name":"0bitmap$946"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1049",
-  "fields":[{"name":"0bitmap$947"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1050",
-  "fields":[{"name":"0bitmap$948"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1051",
-  "fields":[{"name":"0bitmap$949"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1052",
-  "fields":[{"name":"0bitmap$950"}]
-},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1053",
-  "fields":[
-    {"name":"0bitmap$951"}, 
-    {"name":"0bitmap$967"}
-  ]
+  "fields":[{"name":"0bitmap$967"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1054",
-  "fields":[
-    {"name":"0bitmap$952"}, 
-    {"name":"0bitmap$962"}
-  ]
+  "fields":[{"name":"0bitmap$962"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1055",
-  "fields":[
-    {"name":"0bitmap$953"}, 
-    {"name":"0bitmap$958"}
-  ]
+  "fields":[{"name":"0bitmap$958"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1056",
-  "fields":[
-    {"name":"0bitmap$954"}, 
-    {"name":"0bitmap$959"}
-  ]
+  "fields":[{"name":"0bitmap$959"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1057",
@@ -131,19 +60,12 @@
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1058",
-  "fields":[
-    {"name":"0bitmap$959"}, 
-    {"name":"0bitmap$961"}
-  ]
+  "fields":[{"name":"0bitmap$961"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1060",
   "fields":[{"name":"0bitmap$966"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1062",
-  "fields":[{"name":"0bitmap$964"}]
-},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1064",
   "fields":[{"name":"0bitmap$970"}]
@@ -154,58 +76,16 @@
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1066",
-  "fields":[
-    {"name":"0bitmap$969"}, 
-    {"name":"0bitmap$979"}
-  ]
+  "fields":[{"name":"0bitmap$969"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1067",
-  "fields":[
-    {"name":"0bitmap$1033"}, 
-    {"name":"0bitmap$974"}
-  ]
+  "fields":[{"name":"0bitmap$1033"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1068",
   "fields":[{"name":"0bitmap$1005"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1077",
-  "fields":[{"name":"0bitmap$978"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1078",
-  "fields":[{"name":"0bitmap$975"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1079",
-  "fields":[{"name":"0bitmap$976"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1080",
-  "fields":[{"name":"0bitmap$977"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1081",
-  "fields":[{"name":"0bitmap$981"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1082",
-  "fields":[{"name":"0bitmap$1071"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1083",
-  "fields":[{"name":"0bitmap$982"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1084",
-  "fields":[{"name":"0bitmap$1026"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1085",
-  "fields":[{"name":"0bitmap$1012"}]
-},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1105",
   "fields":[{"name":"0bitmap$1028"}]
@@ -244,10 +124,7 @@
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1118",
-  "fields":[
-    {"name":"0bitmap$1016"}, 
-    {"name":"0bitmap$1022"}
-  ]
+  "fields":[{"name":"0bitmap$1016"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1119",
@@ -255,66 +132,31 @@
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1120",
-  "fields":[
-    {"name":"0bitmap$1013"}, 
-    {"name":"0bitmap$1018"}
-  ]
+  "fields":[{"name":"0bitmap$1018"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1121",
-  "fields":[
-    {"name":"0bitmap$1014"}, 
-    {"name":"0bitmap$1019"}
-  ]
+  "fields":[{"name":"0bitmap$1019"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1122",
-  "fields":[
-    {"name":"0bitmap$1015"}, 
-    {"name":"0bitmap$1020"}
-  ]
+  "fields":[{"name":"0bitmap$1020"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1123",
-  "fields":[
-    {"name":"0bitmap$1016"}, 
-    {"name":"0bitmap$1021"}
-  ]
+  "fields":[{"name":"0bitmap$1021"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1124",
   "fields":[{"name":"0bitmap$1022"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1125",
-  "fields":[{"name":"0bitmap$1021"}]
-},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1126",
   "fields":[{"name":"0bitmap$1027"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1129",
-  "fields":[{"name":"0bitmap$1025"}]
-},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1130",
-  "fields":[
-    {"name":"0bitmap$1023"}, 
-    {"name":"0bitmap$1032"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1131",
-  "fields":[{"name":"0bitmap$1024"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1132",
-  "fields":[{"name":"0bitmap$1070"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1133",
-  "fields":[{"name":"0bitmap$1056"}]
+  "fields":[{"name":"0bitmap$1032"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1134",
@@ -360,54 +202,6 @@
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1153",
   "fields":[{"name":"0bitmap$1084"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1166",
-  "fields":[{"name":"0bitmap$1066"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1167",
-  "fields":[{"name":"0bitmap$1061"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1168",
-  "fields":[{"name":"0bitmap$1057"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1169",
-  "fields":[{"name":"0bitmap$1058"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1170",
-  "fields":[{"name":"0bitmap$1059"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1171",
-  "fields":[{"name":"0bitmap$1060"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1173",
-  "fields":[{"name":"0bitmap$1065"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1177",
-  "fields":[{"name":"0bitmap$1069"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1178",
-  "fields":[{"name":"0bitmap$1067"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1179",
-  "fields":[{"name":"0bitmap$1068"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1180",
-  "fields":[{"name":"0bitmap$1100"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1181",
-  "fields":[{"name":"0bitmap$1085"}]
-},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1190",
   "fields":[{"name":"0bitmap$1094"}]
@@ -432,24 +226,9 @@
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1195",
   "fields":[{"name":"0bitmap$1088"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1196",
-  "fields":[{"name":"0bitmap$1099"}]
-},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1197",
-  "fields":[
-    {"name":"0bitmap$1093"}, 
-    {"name":"0bitmap$1098"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1198",
-  "fields":[{"name":"0bitmap$1086"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1199",
-  "fields":[{"name":"0bitmap$1092"}]
+  "fields":[{"name":"0bitmap$1093"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1201",
@@ -471,177 +250,53 @@
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1205",
   "fields":[{"name":"0bitmap$1132"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1206",
-  "fields":[{"name":"0bitmap$1097"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1212",
-  "fields":[{"name":"0bitmap$1121"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1213",
-  "fields":[{"name":"0bitmap$1110"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1224",
-  "fields":[{"name":"0bitmap$1111"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1225",
-  "fields":[{"name":"0bitmap$1115"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1230",
-  "fields":[{"name":"0bitmap$1116"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1231",
-  "fields":[{"name":"0bitmap$1117"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1232",
-  "fields":[{"name":"0bitmap$1120"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1235",
-  "fields":[{"name":"0bitmap$1123"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1236",
-  "fields":[{"name":"0bitmap$1122"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1237",
-  "fields":[{"name":"0bitmap$1146"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1238",
-  "fields":[{"name":"0bitmap$1124"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1239",
-  "fields":[{"name":"0bitmap$1145"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1240",
-  "fields":[{"name":"0bitmap$1134"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1241",
-  "fields":[{"name":"0bitmap$1133"}]
-},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1242",
-  "fields":[
-    {"name":"0bitmap$1125"}, 
-    {"name":"0bitmap$1142"}
-  ]
+  "fields":[{"name":"0bitmap$1142"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1243",
-  "fields":[
-    {"name":"0bitmap$1126"}, 
-    {"name":"0bitmap$1137"}
-  ]
+  "fields":[{"name":"0bitmap$1137"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1244",
-  "fields":[
-    {"name":"0bitmap$1127"}, 
-    {"name":"0bitmap$1133"}
-  ]
+  "fields":[{"name":"0bitmap$1133"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1245",
-  "fields":[
-    {"name":"0bitmap$1128"}, 
-    {"name":"0bitmap$1134"}
-  ]
+  "fields":[{"name":"0bitmap$1134"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1246",
-  "fields":[
-    {"name":"0bitmap$1129"}, 
-    {"name":"0bitmap$1135"}
-  ]
+  "fields":[{"name":"0bitmap$1135"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1247",
-  "fields":[
-    {"name":"0bitmap$1130"}, 
-    {"name":"0bitmap$1136"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1248",
-  "fields":[{"name":"0bitmap$1131"}]
+  "fields":[{"name":"0bitmap$1136"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1249",
-  "fields":[
-    {"name":"0bitmap$1132"}, 
-    {"name":"0bitmap$1141"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$125",
-  "fields":[{"name":"0bitmap$223"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1251",
-  "fields":[{"name":"0bitmap$1135"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1252",
-  "fields":[{"name":"0bitmap$1139"}]
+  "fields":[{"name":"0bitmap$1141"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1253",
-  "fields":[
-    {"name":"0bitmap$1138"}, 
-    {"name":"0bitmap$1145"}
-  ]
+  "fields":[{"name":"0bitmap$1145"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1254",
-  "fields":[
-    {"name":"0bitmap$1136"}, 
-    {"name":"0bitmap$1143"}
-  ]
+  "fields":[{"name":"0bitmap$1143"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1255",
-  "fields":[
-    {"name":"0bitmap$1137"}, 
-    {"name":"0bitmap$1144"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1257",
-  "fields":[{"name":"0bitmap$1140"}]
+  "fields":[{"name":"0bitmap$1144"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1258",
-  "fields":[
-    {"name":"0bitmap$1141"}, 
-    {"name":"0bitmap$1178"}
-  ]
+  "fields":[{"name":"0bitmap$1178"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1259",
-  "fields":[
-    {"name":"0bitmap$1144"}, 
-    {"name":"0bitmap$1163"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$126",
-  "fields":[{"name":"0bitmap$154"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$127",
-  "fields":[{"name":"0bitmap$140"}]
+  "fields":[{"name":"0bitmap$1163"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1274",
@@ -663,27 +318,13 @@
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1284",
   "fields":[{"name":"0bitmap$1175"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1288",
-  "fields":[{"name":"0bitmap$1172"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1289",
-  "fields":[{"name":"0bitmap$1171"}]
-},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1290",
-  "fields":[
-    {"name":"0bitmap$1199"}, 
-    {"name":"0bitmap$1226"}
-  ]
+  "fields":[{"name":"0bitmap$1199"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1291",
-  "fields":[
-    {"name":"0bitmap$1188"}, 
-    {"name":"0bitmap$1202"}
-  ]
+  "fields":[{"name":"0bitmap$1188"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1302",
@@ -751,17 +392,11 @@
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1324",
-  "fields":[
-    {"name":"0bitmap$1207"}, 
-    {"name":"0bitmap$1221"}
-  ]
+  "fields":[{"name":"0bitmap$1207"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1325",
-  "fields":[
-    {"name":"0bitmap$1206"}, 
-    {"name":"0bitmap$1208"}
-  ]
+  "fields":[{"name":"0bitmap$1208"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1326",
@@ -781,157 +416,55 @@
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1330",
-  "fields":[
-    {"name":"0bitmap$1216"}, 
-    {"name":"0bitmap$1217"}
-  ]
+  "fields":[{"name":"0bitmap$1217"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1331",
-  "fields":[
-    {"name":"0bitmap$1207"}, 
-    {"name":"0bitmap$1216"}
-  ]
+  "fields":[{"name":"0bitmap$1216"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1332",
-  "fields":[
-    {"name":"0bitmap$1208"}, 
-    {"name":"0bitmap$1214"}
-  ]
+  "fields":[{"name":"0bitmap$1214"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1333",
-  "fields":[
-    {"name":"0bitmap$1209"}, 
-    {"name":"0bitmap$1215"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1334",
-  "fields":[{"name":"0bitmap$1210"}]
+  "fields":[{"name":"0bitmap$1215"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1335",
-  "fields":[
-    {"name":"0bitmap$1211"}, 
-    {"name":"0bitmap$1218"}
-  ]
+  "fields":[{"name":"0bitmap$1218"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1336",
-  "fields":[
-    {"name":"0bitmap$1212"}, 
-    {"name":"0bitmap$1219"}
-  ]
+  "fields":[{"name":"0bitmap$1219"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1337",
-  "fields":[
-    {"name":"0bitmap$1213"}, 
-    {"name":"0bitmap$1222"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1338",
-  "fields":[{"name":"0bitmap$1214"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1339",
-  "fields":[{"name":"0bitmap$1215"}]
+  "fields":[{"name":"0bitmap$1222"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$134",
   "fields":[{"name":"0bitmap$166"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1341",
-  "fields":[{"name":"0bitmap$1220"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1345",
-  "fields":[{"name":"0bitmap$1225"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1349",
-  "fields":[{"name":"0bitmap$1256"}]
-},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$135",
   "fields":[{"name":"0bitmap$152"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1350",
-  "fields":[{"name":"0bitmap$1238"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1365",
-  "fields":[{"name":"0bitmap$1241"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1366",
-  "fields":[{"name":"0bitmap$1239"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1367",
-  "fields":[{"name":"0bitmap$1240"}]
-},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1368",
   "fields":[{"name":"0bitmap$1252"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1369",
-  "fields":[
-    {"name":"0bitmap$1251"}, 
-    {"name":"0bitmap$1255"}
-  ]
+  "fields":[{"name":"0bitmap$1251"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1370",
-  "fields":[
-    {"name":"0bitmap$1254"}, 
-    {"name":"0bitmap$1314"}
-  ]
+  "fields":[{"name":"0bitmap$1314"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1371",
-  "fields":[
-    {"name":"0bitmap$1242"}, 
-    {"name":"0bitmap$1286"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1372",
-  "fields":[{"name":"0bitmap$1248"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1379",
-  "fields":[{"name":"0bitmap$1253"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1380",
-  "fields":[{"name":"0bitmap$1252"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1381",
-  "fields":[{"name":"0bitmap$1249"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1382",
-  "fields":[{"name":"0bitmap$1250"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1383",
-  "fields":[{"name":"0bitmap$1251"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1385",
-  "fields":[{"name":"0bitmap$1318"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1386",
-  "fields":[{"name":"0bitmap$1283"}]
+  "fields":[{"name":"0bitmap$1286"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1408",
@@ -947,17 +480,11 @@
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1415",
-  "fields":[
-    {"name":"0bitmap$1291"}, 
-    {"name":"0bitmap$1311"}
-  ]
+  "fields":[{"name":"0bitmap$1291"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1416",
-  "fields":[
-    {"name":"0bitmap$1292"}, 
-    {"name":"0bitmap$1310"}
-  ]
+  "fields":[{"name":"0bitmap$1292"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1417",
@@ -1019,38 +546,6 @@
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1438",
   "fields":[{"name":"0bitmap$1326"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1445",
-  "fields":[{"name":"0bitmap$1314"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1446",
-  "fields":[{"name":"0bitmap$1312"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1447",
-  "fields":[{"name":"0bitmap$1313"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1448",
-  "fields":[{"name":"0bitmap$1317"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1449",
-  "fields":[{"name":"0bitmap$1315"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1450",
-  "fields":[{"name":"0bitmap$1316"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1451",
-  "fields":[{"name":"0bitmap$1339"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1452",
-  "fields":[{"name":"0bitmap$1328"}]
-},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1453",
   "fields":[{"name":"0bitmap$1329"}]
@@ -1079,28 +574,9 @@
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1460",
   "fields":[{"name":"0bitmap$1336"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1463",
-  "fields":[{"name":"0bitmap$1329"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1464",
-  "fields":[{"name":"0bitmap$1333"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1465",
-  "fields":[{"name":"0bitmap$1332"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1466",
-  "fields":[{"name":"0bitmap$1330"}]
-},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1467",
-  "fields":[
-    {"name":"0bitmap$1331"}, 
-    {"name":"0bitmap$1341"}
-  ]
+  "fields":[{"name":"0bitmap$1341"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1468",
@@ -1108,24 +584,15 @@
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1469",
-  "fields":[
-    {"name":"0bitmap$1334"}, 
-    {"name":"0bitmap$1337"}
-  ]
+  "fields":[{"name":"0bitmap$1337"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1470",
-  "fields":[
-    {"name":"0bitmap$1335"}, 
-    {"name":"0bitmap$1338"}
-  ]
+  "fields":[{"name":"0bitmap$1338"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1471",
-  "fields":[
-    {"name":"0bitmap$1338"}, 
-    {"name":"0bitmap$1339"}
-  ]
+  "fields":[{"name":"0bitmap$1339"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1473",
@@ -1133,54 +600,7 @@
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1474",
-  "fields":[
-    {"name":"0bitmap$1342"}, 
-    {"name":"0bitmap$1371"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1475",
-  "fields":[{"name":"0bitmap$1340"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1476",
-  "fields":[{"name":"0bitmap$1341"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1477",
-  "fields":[{"name":"0bitmap$1345"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1478",
-  "fields":[{"name":"0bitmap$1343"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1479",
-  "fields":[{"name":"0bitmap$1344"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1480",
-  "fields":[{"name":"0bitmap$1352"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1488",
-  "fields":[{"name":"0bitmap$1353"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1489",
-  "fields":[{"name":"0bitmap$1361"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1498",
-  "fields":[{"name":"0bitmap$1364"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1499",
-  "fields":[{"name":"0bitmap$1362"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1500",
-  "fields":[{"name":"0bitmap$1363"}]
+  "fields":[{"name":"0bitmap$1371"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1503",
@@ -1302,65 +722,21 @@
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1588",
   "fields":[{"name":"0bitmap$1451"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$160",
-  "fields":[{"name":"0bitmap$150"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$161",
-  "fields":[{"name":"0bitmap$145"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$162",
-  "fields":[{"name":"0bitmap$141"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$163",
-  "fields":[{"name":"0bitmap$142"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$164",
-  "fields":[{"name":"0bitmap$143"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$165",
-  "fields":[{"name":"0bitmap$144"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$167",
-  "fields":[{"name":"0bitmap$149"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$171",
-  "fields":[{"name":"0bitmap$153"}]
-},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$172",
-  "fields":[
-    {"name":"0bitmap$151"}, 
-    {"name":"0bitmap$162"}
-  ]
+  "fields":[{"name":"0bitmap$162"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$173",
-  "fields":[
-    {"name":"0bitmap$152"}, 
-    {"name":"0bitmap$157"}
-  ]
+  "fields":[{"name":"0bitmap$157"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$174",
-  "fields":[
-    {"name":"0bitmap$153"}, 
-    {"name":"0bitmap$208"}
-  ]
+  "fields":[{"name":"0bitmap$153"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$175",
-  "fields":[
-    {"name":"0bitmap$154"}, 
-    {"name":"0bitmap$184"}
-  ]
+  "fields":[{"name":"0bitmap$154"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$176",
@@ -1398,68 +774,13 @@
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$2",
   "fields":[{"name":"0bitmap$2"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$208",
-  "fields":[{"name":"0bitmap$203"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$209",
-  "fields":[{"name":"0bitmap$188"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$214",
-  "fields":[{"name":"0bitmap$198"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$215",
-  "fields":[{"name":"0bitmap$189"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$216",
-  "fields":[{"name":"0bitmap$190"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$217",
-  "fields":[{"name":"0bitmap$191"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$218",
-  "fields":[{"name":"0bitmap$192"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$219",
-  "fields":[{"name":"0bitmap$193"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$220",
-  "fields":[{"name":"0bitmap$194"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$221",
-  "fields":[{"name":"0bitmap$195"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$222",
-  "fields":[{"name":"0bitmap$196"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$223",
-  "fields":[{"name":"0bitmap$197"}]
-},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$224",
   "fields":[{"name":"0bitmap$223"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$225",
-  "fields":[
-    {"name":"0bitmap$202"}, 
-    {"name":"0bitmap$204"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$229",
-  "fields":[{"name":"0bitmap$207"}]
+  "fields":[{"name":"0bitmap$204"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$230",
@@ -1475,10 +796,7 @@
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$233",
-  "fields":[
-    {"name":"0bitmap$207"}, 
-    {"name":"0bitmap$222"}
-  ]
+  "fields":[{"name":"0bitmap$207"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$234",
@@ -1524,16 +842,9 @@
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$245",
   "fields":[{"name":"0bitmap$222"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$248",
-  "fields":[{"name":"0bitmap$224"}]
-},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$249",
-  "fields":[
-    {"name":"0bitmap$227"}, 
-    {"name":"0bitmap$314"}
-  ]
+  "fields":[{"name":"0bitmap$227"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$253",
@@ -1547,14 +858,6 @@
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$269",
   "fields":[{"name":"0bitmap$342"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$347",
-  "fields":[{"name":"0bitmap$317"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$349",
-  "fields":[{"name":"0bitmap$425"}]
-},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$375",
   "fields":[{"name":"0bitmap$345"}]
@@ -1567,80 +870,9 @@
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$4",
   "fields":[{"name":"0bitmap$3"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$468",
-  "fields":[{"name":"0bitmap$439"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$469",
-  "fields":[{"name":"0bitmap$438"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$470",
-  "fields":[{"name":"0bitmap$427"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$472",
-  "fields":[{"name":"0bitmap$437"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$473",
-  "fields":[{"name":"0bitmap$436"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$474",
-  "fields":[{"name":"0bitmap$428"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$475",
-  "fields":[{"name":"0bitmap$429"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$476",
-  "fields":[{"name":"0bitmap$430"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$477",
-  "fields":[{"name":"0bitmap$431"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$478",
-  "fields":[{"name":"0bitmap$432"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$479",
-  "fields":[{"name":"0bitmap$433"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$480",
-  "fields":[{"name":"0bitmap$434"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$481",
-  "fields":[{"name":"0bitmap$435"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$483",
-  "fields":[{"name":"0bitmap$553"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$484",
-  "fields":[{"name":"0bitmap$552"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$485",
-  "fields":[{"name":"0bitmap$483"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$486",
-  "fields":[{"name":"0bitmap$469"}]
-},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$5",
-  "fields":[
-    {"name":"0bitmap$315"}, 
-    {"name":"0bitmap$343"}
-  ]
+  "fields":[{"name":"0bitmap$343"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$504",
@@ -1683,220 +915,85 @@
   "fields":[{"name":"0bitmap$468"}]
 },
 {
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$515",
-  "fields":[{"name":"0bitmap$469"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$516",
-  "fields":[{"name":"0bitmap$470"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$517",
-  "fields":[{"name":"0bitmap$471"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$519",
-  "fields":[
-    {"name":"0bitmap$479"}, 
-    {"name":"0bitmap$601"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$520",
-  "fields":[
-    {"name":"0bitmap$474"}, 
-    {"name":"0bitmap$600"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$521",
-  "fields":[
-    {"name":"0bitmap$470"}, 
-    {"name":"0bitmap$523"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$522",
-  "fields":[
-    {"name":"0bitmap$471"}, 
-    {"name":"0bitmap$509"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$523",
-  "fields":[{"name":"0bitmap$472"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$524",
-  "fields":[{"name":"0bitmap$473"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$526",
-  "fields":[{"name":"0bitmap$478"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$530",
-  "fields":[{"name":"0bitmap$482"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$531",
-  "fields":[{"name":"0bitmap$480"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$532",
-  "fields":[{"name":"0bitmap$481"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$533",
-  "fields":[{"name":"0bitmap$537"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$559",
-  "fields":[{"name":"0bitmap$519"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$560",
-  "fields":[{"name":"0bitmap$514"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$561",
-  "fields":[{"name":"0bitmap$510"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$562",
-  "fields":[{"name":"0bitmap$511"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$563",
-  "fields":[{"name":"0bitmap$512"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$564",
-  "fields":[{"name":"0bitmap$513"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$566",
-  "fields":[{"name":"0bitmap$518"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$570",
-  "fields":[{"name":"0bitmap$522"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$571",
-  "fields":[{"name":"0bitmap$520"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$572",
-  "fields":[{"name":"0bitmap$521"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$573",
-  "fields":[{"name":"0bitmap$585"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$592",
-  "fields":[{"name":"0bitmap$551"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$6",
-  "fields":[
-    {"name":"0bitmap$110"}, 
-    {"name":"0bitmap$118"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$607",
-  "fields":[{"name":"0bitmap$651"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$608",
-  "fields":[{"name":"0bitmap$565"}]
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$515",
+  "fields":[{"name":"0bitmap$469"}]
 },
 {
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$609",
-  "fields":[{"name":"0bitmap$563"}]
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$516",
+  "fields":[{"name":"0bitmap$470"}]
 },
 {
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$610",
-  "fields":[{"name":"0bitmap$562"}]
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$517",
+  "fields":[{"name":"0bitmap$471"}]
 },
 {
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$611",
-  "fields":[{"name":"0bitmap$554"}]
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$519",
+  "fields":[{"name":"0bitmap$601"}]
 },
 {
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$612",
-  "fields":[{"name":"0bitmap$555"}]
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$520",
+  "fields":[{"name":"0bitmap$600"}]
 },
 {
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$613",
-  "fields":[{"name":"0bitmap$556"}]
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$521",
+  "fields":[{"name":"0bitmap$523"}]
 },
 {
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$614",
-  "fields":[{"name":"0bitmap$557"}]
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$522",
+  "fields":[{"name":"0bitmap$509"}]
 },
 {
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$615",
-  "fields":[{"name":"0bitmap$558"}]
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$559",
+  "fields":[{"name":"0bitmap$519"}]
 },
 {
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$616",
-  "fields":[{"name":"0bitmap$559"}]
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$560",
+  "fields":[{"name":"0bitmap$514"}]
 },
 {
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$617",
-  "fields":[{"name":"0bitmap$560"}]
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$561",
+  "fields":[{"name":"0bitmap$510"}]
 },
 {
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$618",
-  "fields":[{"name":"0bitmap$561"}]
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$562",
+  "fields":[{"name":"0bitmap$511"}]
 },
 {
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$620",
-  "fields":[{"name":"0bitmap$564"}]
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$563",
+  "fields":[{"name":"0bitmap$512"}]
 },
 {
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$622",
-  "fields":[{"name":"0bitmap$581"}]
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$564",
+  "fields":[{"name":"0bitmap$513"}]
 },
 {
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$623",
-  "fields":[{"name":"0bitmap$575"}]
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$566",
+  "fields":[{"name":"0bitmap$518"}]
 },
 {
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$634",
-  "fields":[{"name":"0bitmap$579"}]
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$570",
+  "fields":[{"name":"0bitmap$522"}]
 },
 {
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$635",
-  "fields":[{"name":"0bitmap$578"}]
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$571",
+  "fields":[{"name":"0bitmap$520"}]
 },
 {
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$636",
-  "fields":[{"name":"0bitmap$576"}]
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$572",
+  "fields":[{"name":"0bitmap$521"}]
 },
 {
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$637",
-  "fields":[{"name":"0bitmap$577"}]
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$573",
+  "fields":[{"name":"0bitmap$585"}]
 },
 {
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$639",
-  "fields":[{"name":"0bitmap$580"}]
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$6",
+  "fields":[{"name":"0bitmap$118"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$640",
   "fields":[{"name":"0bitmap$599"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$641",
-  "fields":[{"name":"0bitmap$591"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$652",
-  "fields":[{"name":"0bitmap$595"}]
-},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$655",
   "fields":[{"name":"0bitmap$699"}]
@@ -1907,84 +1004,47 @@
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$657",
-  "fields":[
-    {"name":"0bitmap$596"}, 
-    {"name":"0bitmap$611"}
-  ]
+  "fields":[{"name":"0bitmap$611"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$658",
-  "fields":[
-    {"name":"0bitmap$597"}, 
-    {"name":"0bitmap$610"}
-  ]
+  "fields":[{"name":"0bitmap$610"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$659",
-  "fields":[
-    {"name":"0bitmap$598"}, 
-    {"name":"0bitmap$602"}
-  ]
+  "fields":[{"name":"0bitmap$602"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$660",
-  "fields":[
-    {"name":"0bitmap$600"}, 
-    {"name":"0bitmap$603"}
-  ]
+  "fields":[{"name":"0bitmap$603"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$661",
-  "fields":[
-    {"name":"0bitmap$599"}, 
-    {"name":"0bitmap$604"}
-  ]
+  "fields":[{"name":"0bitmap$604"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$662",
-  "fields":[
-    {"name":"0bitmap$605"}, 
-    {"name":"0bitmap$617"}
-  ]
+  "fields":[{"name":"0bitmap$605"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$663",
-  "fields":[
-    {"name":"0bitmap$601"}, 
-    {"name":"0bitmap$606"}
-  ]
+  "fields":[{"name":"0bitmap$606"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$664",
-  "fields":[
-    {"name":"0bitmap$602"}, 
-    {"name":"0bitmap$607"}
-  ]
+  "fields":[{"name":"0bitmap$607"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$665",
-  "fields":[
-    {"name":"0bitmap$608"}, 
-    {"name":"0bitmap$616"}
-  ]
+  "fields":[{"name":"0bitmap$608"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$666",
-  "fields":[
-    {"name":"0bitmap$609"}, 
-    {"name":"0bitmap$615"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$667",
-  "fields":[{"name":"0bitmap$603"}]
+  "fields":[{"name":"0bitmap$609"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$668",
-  "fields":[
-    {"name":"0bitmap$609"}, 
-    {"name":"0bitmap$612"}
-  ]
+  "fields":[{"name":"0bitmap$612"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$670",
@@ -1994,20 +1054,9 @@
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$671",
   "fields":[{"name":"0bitmap$623"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$675",
-  "fields":[{"name":"0bitmap$614"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$681",
-  "fields":[{"name":"0bitmap$630"}]
-},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$682",
-  "fields":[
-    {"name":"0bitmap$619"}, 
-    {"name":"0bitmap$627"}
-  ]
+  "fields":[{"name":"0bitmap$627"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$683",
@@ -2015,71 +1064,19 @@
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$684",
-  "fields":[
-    {"name":"0bitmap$624"}, 
-    {"name":"0bitmap$629"}
-  ]
+  "fields":[{"name":"0bitmap$624"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$685",
-  "fields":[
-    {"name":"0bitmap$625"}, 
-    {"name":"0bitmap$628"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$686",
-  "fields":[{"name":"0bitmap$620"}]
+  "fields":[{"name":"0bitmap$625"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$687",
-  "fields":[
-    {"name":"0bitmap$621"}, 
-    {"name":"0bitmap$628"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$688",
-  "fields":[{"name":"0bitmap$622"}]
+  "fields":[{"name":"0bitmap$628"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$689",
-  "fields":[
-    {"name":"0bitmap$623"}, 
-    {"name":"0bitmap$639"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$690",
-  "fields":[{"name":"0bitmap$624"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$691",
-  "fields":[{"name":"0bitmap$625"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$692",
-  "fields":[{"name":"0bitmap$626"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$693",
-  "fields":[{"name":"0bitmap$627"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$695",
-  "fields":[{"name":"0bitmap$648"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$696",
-  "fields":[{"name":"0bitmap$632"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$698",
-  "fields":[{"name":"0bitmap$633"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$699",
-  "fields":[{"name":"0bitmap$647"}]
+  "fields":[{"name":"0bitmap$639"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$700",
@@ -2127,29 +1124,11 @@
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$715",
-  "fields":[
-    {"name":"0bitmap$649"}, 
-    {"name":"0bitmap$651"}
-  ]
+  "fields":[{"name":"0bitmap$651"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$716",
-  "fields":[
-    {"name":"0bitmap$650"}, 
-    {"name":"0bitmap$657"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$717",
-  "fields":[{"name":"0bitmap$673"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$718",
-  "fields":[{"name":"0bitmap$672"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$719",
-  "fields":[{"name":"0bitmap$661"}]
+  "fields":[{"name":"0bitmap$657"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$723",
@@ -2161,35 +1140,19 @@
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$730",
-  "fields":[
-    {"name":"0bitmap$662"}, 
-    {"name":"0bitmap$667"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$731",
-  "fields":[{"name":"0bitmap$666"}]
+  "fields":[{"name":"0bitmap$667"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$732",
-  "fields":[
-    {"name":"0bitmap$665"}, 
-    {"name":"0bitmap$677"}
-  ]
+  "fields":[{"name":"0bitmap$677"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$733",
-  "fields":[
-    {"name":"0bitmap$663"}, 
-    {"name":"0bitmap$676"}
-  ]
+  "fields":[{"name":"0bitmap$676"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$734",
-  "fields":[
-    {"name":"0bitmap$664"}, 
-    {"name":"0bitmap$668"}
-  ]
+  "fields":[{"name":"0bitmap$668"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$735",
@@ -2197,121 +1160,43 @@
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$736",
-  "fields":[
-    {"name":"0bitmap$667"}, 
-    {"name":"0bitmap$670"}
-  ]
+  "fields":[{"name":"0bitmap$670"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$737",
-  "fields":[
-    {"name":"0bitmap$668"}, 
-    {"name":"0bitmap$671"}
-  ]
+  "fields":[{"name":"0bitmap$671"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$738",
-  "fields":[
-    {"name":"0bitmap$671"}, 
-    {"name":"0bitmap$672"}
-  ]
+  "fields":[{"name":"0bitmap$672"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$739",
-  "fields":[
-    {"name":"0bitmap$670"}, 
-    {"name":"0bitmap$673"}
-  ]
+  "fields":[{"name":"0bitmap$673"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$740",
-  "fields":[
-    {"name":"0bitmap$669"}, 
-    {"name":"0bitmap$674"}
-  ]
+  "fields":[{"name":"0bitmap$674"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$741",
-  "fields":[
-    {"name":"0bitmap$675"}, 
-    {"name":"0bitmap$695"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$742",
-  "fields":[{"name":"0bitmap$694"}]
+  "fields":[{"name":"0bitmap$675"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$743",
-  "fields":[
-    {"name":"0bitmap$683"}, 
-    {"name":"0bitmap$696"}
-  ]
+  "fields":[{"name":"0bitmap$696"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$744",
-  "fields":[
-    {"name":"0bitmap$680"}, 
-    {"name":"0bitmap$682"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$745",
-  "fields":[{"name":"0bitmap$674"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$746",
-  "fields":[
-    {"name":"0bitmap$675"}, 
-    {"name":"0bitmap$681"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$747",
-  "fields":[
-    {"name":"0bitmap$676"}, 
-    {"name":"0bitmap$695"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$748",
-  "fields":[{"name":"0bitmap$677"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$749",
-  "fields":[{"name":"0bitmap$678"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$750",
-  "fields":[{"name":"0bitmap$679"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$751",
   "fields":[{"name":"0bitmap$680"}]
 },
 {
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$752",
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$746",
   "fields":[{"name":"0bitmap$681"}]
 },
 {
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$754",
-  "fields":[{"name":"0bitmap$684"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$755",
-  "fields":[{"name":"0bitmap$688"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$760",
-  "fields":[{"name":"0bitmap$689"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$761",
-  "fields":[{"name":"0bitmap$690"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$762",
-  "fields":[{"name":"0bitmap$693"}]
+  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$747",
+  "fields":[{"name":"0bitmap$695"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$763",
@@ -2323,32 +1208,15 @@
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$765",
-  "fields":[
-    {"name":"0bitmap$713"}, 
-    {"name":"0bitmap$721"}
-  ]
+  "fields":[{"name":"0bitmap$721"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$766",
-  "fields":[
-    {"name":"0bitmap$712"}, 
-    {"name":"0bitmap$720"}
-  ]
+  "fields":[{"name":"0bitmap$720"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$767",
-  "fields":[
-    {"name":"0bitmap$696"}, 
-    {"name":"0bitmap$709"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$768",
-  "fields":[{"name":"0bitmap$697"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$769",
-  "fields":[{"name":"0bitmap$711"}]
+  "fields":[{"name":"0bitmap$709"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$778",
@@ -2376,24 +1244,15 @@
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$785",
-  "fields":[
-    {"name":"0bitmap$716"}, 
-    {"name":"0bitmap$732"}
-  ]
+  "fields":[{"name":"0bitmap$716"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$786",
-  "fields":[
-    {"name":"0bitmap$719"}, 
-    {"name":"0bitmap$731"}
-  ]
+  "fields":[{"name":"0bitmap$719"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$787",
-  "fields":[
-    {"name":"0bitmap$715"}, 
-    {"name":"0bitmap$718"}
-  ]
+  "fields":[{"name":"0bitmap$718"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$788",
@@ -2401,17 +1260,11 @@
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$789",
-  "fields":[
-    {"name":"0bitmap$716"}, 
-    {"name":"0bitmap$743"}
-  ]
+  "fields":[{"name":"0bitmap$743"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$790",
-  "fields":[
-    {"name":"0bitmap$730"}, 
-    {"name":"0bitmap$742"}
-  ]
+  "fields":[{"name":"0bitmap$742"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$791",
@@ -2461,20 +1314,9 @@
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$803",
   "fields":[{"name":"0bitmap$736"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$806",
-  "fields":[{"name":"0bitmap$760"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$807",
-  "fields":[{"name":"0bitmap$754"}]
-},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$808",
-  "fields":[
-    {"name":"0bitmap$737"}, 
-    {"name":"0bitmap$745"}
-  ]
+  "fields":[{"name":"0bitmap$737"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$809",
@@ -2504,66 +1346,17 @@
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$817",
   "fields":[{"name":"0bitmap$759"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$823",
-  "fields":[{"name":"0bitmap$753"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$824",
-  "fields":[{"name":"0bitmap$750"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$825",
-  "fields":[{"name":"0bitmap$749"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$826",
-  "fields":[{"name":"0bitmap$746"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$827",
-  "fields":[{"name":"0bitmap$747"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$828",
-  "fields":[{"name":"0bitmap$748"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$829",
-  "fields":[{"name":"0bitmap$751"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$830",
-  "fields":[{"name":"0bitmap$752"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$832",
-  "fields":[{"name":"0bitmap$759"}]
-},
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$833",
-  "fields":[
-    {"name":"0bitmap$755"}, 
-    {"name":"0bitmap$780"}
-  ]
+  "fields":[{"name":"0bitmap$780"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$834",
-  "fields":[
-    {"name":"0bitmap$758"}, 
-    {"name":"0bitmap$779"}
-  ]
+  "fields":[{"name":"0bitmap$779"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$835",
-  "fields":[
-    {"name":"0bitmap$756"}, 
-    {"name":"0bitmap$763"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$836",
-  "fields":[{"name":"0bitmap$757"}]
+  "fields":[{"name":"0bitmap$763"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$837",
@@ -2571,14 +1364,7 @@
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$838",
-  "fields":[
-    {"name":"0bitmap$1072"}, 
-    {"name":"0bitmap$778"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$839",
-  "fields":[{"name":"0bitmap$867"}]
+  "fields":[{"name":"0bitmap$778"}]
 },
 {
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$854",
@@ -2652,42 +1438,6 @@
   "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$887",
   "fields":[{"name":"0bitmap$923"}]
 },
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$958",
-  "fields":[{"name":"0bitmap$980"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$959",
-  "fields":[{"name":"0bitmap$911"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$960",
-  "fields":[{"name":"0bitmap$897"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$993",
-  "fields":[{"name":"0bitmap$907"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$994",
-  "fields":[{"name":"0bitmap$902"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$995",
-  "fields":[{"name":"0bitmap$898"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$996",
-  "fields":[{"name":"0bitmap$899"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$997",
-  "fields":[{"name":"0bitmap$900"}]
-},
-{
-  "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$998",
-  "fields":[{"name":"0bitmap$901"}]
-},
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$1",
   "fields":[{"name":"0bitmap$23"}]
@@ -2778,42 +1528,23 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$124",
-  "fields":[
-    {"name":"0bitmap$115"}, 
-    {"name":"0bitmap$127"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$125",
-  "fields":[{"name":"0bitmap$126"}]
+  "fields":[{"name":"0bitmap$115"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$126",
-  "fields":[
-    {"name":"0bitmap$117"}, 
-    {"name":"0bitmap$129"}
-  ]
+  "fields":[{"name":"0bitmap$129"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$127",
-  "fields":[
-    {"name":"0bitmap$116"}, 
-    {"name":"0bitmap$128"}
-  ]
+  "fields":[{"name":"0bitmap$128"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$128",
-  "fields":[
-    {"name":"0bitmap$114"}, 
-    {"name":"0bitmap$119"}
-  ]
+  "fields":[{"name":"0bitmap$119"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$129",
-  "fields":[
-    {"name":"0bitmap$115"}, 
-    {"name":"0bitmap$118"}
-  ]
+  "fields":[{"name":"0bitmap$118"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$130",
@@ -2821,21 +1552,11 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$131",
-  "fields":[
-    {"name":"0bitmap$117"}, 
-    {"name":"0bitmap$125"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$132",
-  "fields":[{"name":"0bitmap$118"}]
+  "fields":[{"name":"0bitmap$117"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$133",
-  "fields":[
-    {"name":"0bitmap$119"}, 
-    {"name":"0bitmap$127"}
-  ]
+  "fields":[{"name":"0bitmap$127"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$134",
@@ -2863,49 +1584,27 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$140",
-  "fields":[
-    {"name":"0bitmap$126"}, 
-    {"name":"0bitmap$129"}
-  ]
+  "fields":[{"name":"0bitmap$126"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$142",
-  "fields":[
-    {"name":"0bitmap$131"}, 
-    {"name":"0bitmap$139"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$143",
-  "fields":[{"name":"0bitmap$138"}]
+  "fields":[{"name":"0bitmap$131"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$144",
-  "fields":[
-    {"name":"0bitmap$133"}, 
-    {"name":"0bitmap$141"}
-  ]
+  "fields":[{"name":"0bitmap$141"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$145",
-  "fields":[
-    {"name":"0bitmap$132"}, 
-    {"name":"0bitmap$140"}
-  ]
+  "fields":[{"name":"0bitmap$140"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$146",
-  "fields":[
-    {"name":"0bitmap$130"}, 
-    {"name":"0bitmap$135"}
-  ]
+  "fields":[{"name":"0bitmap$135"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$147",
-  "fields":[
-    {"name":"0bitmap$131"}, 
-    {"name":"0bitmap$134"}
-  ]
+  "fields":[{"name":"0bitmap$134"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$148",
@@ -2913,25 +1612,15 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$149",
-  "fields":[
-    {"name":"0bitmap$133"}, 
-    {"name":"0bitmap$137"}
-  ]
+  "fields":[{"name":"0bitmap$133"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$15",
   "fields":[{"name":"0bitmap$14"}]
 },
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$150",
-  "fields":[{"name":"0bitmap$134"}]
-},
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$151",
-  "fields":[
-    {"name":"0bitmap$135"}, 
-    {"name":"0bitmap$139"}
-  ]
+  "fields":[{"name":"0bitmap$139"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$152",
@@ -2939,52 +1628,31 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$153",
-  "fields":[
-    {"name":"0bitmap$137"}, 
-    {"name":"0bitmap$141"}
-  ]
+  "fields":[{"name":"0bitmap$137"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$154",
-  "fields":[
-    {"name":"0bitmap$138"}, 
-    {"name":"0bitmap$140"}
-  ]
+  "fields":[{"name":"0bitmap$138"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$155",
-  "fields":[
-    {"name":"0bitmap$143"}, 
-    {"name":"0bitmap$172"}
-  ]
+  "fields":[{"name":"0bitmap$143"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$156",
-  "fields":[
-    {"name":"0bitmap$142"}, 
-    {"name":"0bitmap$171"}
-  ]
+  "fields":[{"name":"0bitmap$142"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$157",
-  "fields":[
-    {"name":"0bitmap$151"}, 
-    {"name":"0bitmap$178"}
-  ]
+  "fields":[{"name":"0bitmap$178"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$158",
-  "fields":[
-    {"name":"0bitmap$146"}, 
-    {"name":"0bitmap$177"}
-  ]
+  "fields":[{"name":"0bitmap$177"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$159",
-  "fields":[
-    {"name":"0bitmap$142"}, 
-    {"name":"0bitmap$153"}
-  ]
+  "fields":[{"name":"0bitmap$153"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$16",
@@ -2992,10 +1660,7 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$160",
-  "fields":[
-    {"name":"0bitmap$143"}, 
-    {"name":"0bitmap$148"}
-  ]
+  "fields":[{"name":"0bitmap$148"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$161",
@@ -3011,21 +1676,11 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$164",
-  "fields":[
-    {"name":"0bitmap$147"}, 
-    {"name":"0bitmap$150"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$165",
   "fields":[{"name":"0bitmap$147"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$166",
-  "fields":[
-    {"name":"0bitmap$148"}, 
-    {"name":"0bitmap$152"}
-  ]
+  "fields":[{"name":"0bitmap$152"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$167",
@@ -3033,17 +1688,11 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$168",
-  "fields":[
-    {"name":"0bitmap$150"}, 
-    {"name":"0bitmap$170"}
-  ]
+  "fields":[{"name":"0bitmap$150"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$169",
-  "fields":[
-    {"name":"0bitmap$151"}, 
-    {"name":"0bitmap$155"}
-  ]
+  "fields":[{"name":"0bitmap$151"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$17",
@@ -3057,20 +1706,9 @@
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$171",
   "fields":[{"name":"0bitmap$157"}]
 },
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$174",
-  "fields":[{"name":"0bitmap$165"}]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$175",
-  "fields":[{"name":"0bitmap$156"}]
-},
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$176",
-  "fields":[
-    {"name":"0bitmap$157"}, 
-    {"name":"0bitmap$171"}
-  ]
+  "fields":[{"name":"0bitmap$171"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$177",
@@ -3110,10 +1748,7 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$185",
-  "fields":[
-    {"name":"0bitmap$166"}, 
-    {"name":"0bitmap$169"}
-  ]
+  "fields":[{"name":"0bitmap$166"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$186",
@@ -3129,44 +1764,19 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$189",
-  "fields":[
-    {"name":"0bitmap$170"}, 
-    {"name":"0bitmap$174"}
-  ]
+  "fields":[{"name":"0bitmap$170"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$19",
   "fields":[{"name":"0bitmap$19"}]
 },
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$190",
-  "fields":[{"name":"0bitmap$173"}]
-},
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$191",
-  "fields":[
-    {"name":"0bitmap$175"}, 
-    {"name":"0bitmap$187"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$192",
-  "fields":[{"name":"0bitmap$186"}]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$193",
-  "fields":[{"name":"0bitmap$177"}]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$194",
   "fields":[{"name":"0bitmap$175"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$195",
-  "fields":[
-    {"name":"0bitmap$176"}, 
-    {"name":"0bitmap$180"}
-  ]
+  "fields":[{"name":"0bitmap$180"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$196",
@@ -3174,21 +1784,11 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$197",
-  "fields":[
-    {"name":"0bitmap$181"}, 
-    {"name":"0bitmap$182"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$198",
-  "fields":[{"name":"0bitmap$178"}]
+  "fields":[{"name":"0bitmap$182"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$199",
-  "fields":[
-    {"name":"0bitmap$179"}, 
-    {"name":"0bitmap$195"}
-  ]
+  "fields":[{"name":"0bitmap$195"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$2",
@@ -3200,10 +1800,7 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$200",
-  "fields":[
-    {"name":"0bitmap$180"}, 
-    {"name":"0bitmap$194"}
-  ]
+  "fields":[{"name":"0bitmap$194"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$201",
@@ -3211,28 +1808,15 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$202",
-  "fields":[
-    {"name":"0bitmap$183"}, 
-    {"name":"0bitmap$185"}
-  ]
+  "fields":[{"name":"0bitmap$183"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$203",
-  "fields":[
-    {"name":"0bitmap$182"}, 
-    {"name":"0bitmap$184"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$204",
-  "fields":[{"name":"0bitmap$183"}]
+  "fields":[{"name":"0bitmap$184"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$205",
-  "fields":[
-    {"name":"0bitmap$184"}, 
-    {"name":"0bitmap$189"}
-  ]
+  "fields":[{"name":"0bitmap$189"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$206",
@@ -3244,14 +1828,7 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$208",
-  "fields":[
-    {"name":"0bitmap$188"}, 
-    {"name":"0bitmap$213"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$209",
-  "fields":[{"name":"0bitmap$193"}]
+  "fields":[{"name":"0bitmap$188"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$21",
@@ -3259,67 +1836,35 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$210",
-  "fields":[
-    {"name":"0bitmap$192"}, 
-    {"name":"0bitmap$193"}
-  ]
+  "fields":[{"name":"0bitmap$193"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$211",
-  "fields":[
-    {"name":"0bitmap$190"}, 
-    {"name":"0bitmap$191"}
-  ]
+  "fields":[{"name":"0bitmap$190"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$212",
-  "fields":[
-    {"name":"0bitmap$189"}, 
-    {"name":"0bitmap$191"}
-  ]
+  "fields":[{"name":"0bitmap$191"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$213",
-  "fields":[
-    {"name":"0bitmap$190"}, 
-    {"name":"0bitmap$192"}
-  ]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$214",
-  "fields":[{"name":"0bitmap$208"}]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$215",
-  "fields":[{"name":"0bitmap$207"}]
+  "fields":[{"name":"0bitmap$192"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$216",
-  "fields":[
-    {"name":"0bitmap$197"}, 
-    {"name":"0bitmap$221"}
-  ]
+  "fields":[{"name":"0bitmap$221"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$217",
-  "fields":[
-    {"name":"0bitmap$196"}, 
-    {"name":"0bitmap$201"}
-  ]
+  "fields":[{"name":"0bitmap$201"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$218",
-  "fields":[
-    {"name":"0bitmap$194"}, 
-    {"name":"0bitmap$200"}
-  ]
+  "fields":[{"name":"0bitmap$200"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$219",
-  "fields":[
-    {"name":"0bitmap$195"}, 
-    {"name":"0bitmap$199"}
-  ]
+  "fields":[{"name":"0bitmap$199"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$22",
@@ -3327,10 +1872,7 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$220",
-  "fields":[
-    {"name":"0bitmap$197"}, 
-    {"name":"0bitmap$206"}
-  ]
+  "fields":[{"name":"0bitmap$197"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$221",
@@ -3368,22 +1910,6 @@
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$23",
   "fields":[{"name":"0bitmap$20"}]
 },
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$230",
-  "fields":[{"name":"0bitmap$210"}]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$232",
-  "fields":[{"name":"0bitmap$212"}]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$233",
-  "fields":[{"name":"0bitmap$211"}]
-},
-{
-  "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$236",
-  "fields":[{"name":"0bitmap$214"}]
-},
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$238",
   "fields":[{"name":"0bitmap$218"}]
@@ -3650,10 +2176,7 @@
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$95",
-  "fields":[
-    {"name":"0bitmap$188"}, 
-    {"name":"0bitmap$196"}
-  ]
+  "fields":[{"name":"0bitmap$196"}]
 },
 {
   "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$96",
diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala
index d6728ac94..7f84605d1 100644
--- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala
+++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTesterBaseWriter.scala
@@ -297,17 +297,18 @@ case class ComponentTesterBaseWriter(
                 line(s"delete this->$historyName;")
               })
             lazy val destroyDpHistories = {
+              lazy val destroyProductGetHistory = lines(
+                "delete this->productGetHistory;"
+              )
               lazy val destroyProductRequestHistory = lines(
-                """|// Destroy product request history
-                   |delete this->productRequestHistory;
-                   |"""
+                "delete this->productRequestHistory;"
               )
               val destroyProductSendHistory = lines(
-                """|// Destroy product send history
-                   |delete this->productSendHistory;
-                   |"""
+                "delete this->productSendHistory;"
               )
+              line("// Destroy data product histories") ::
               List.concat(
+                guardedList (hasProductGetPort) (destroyProductGetHistory),
                 guardedList (hasProductRequestPort) (destroyProductRequestHistory),
                 destroyProductSendHistory
               )
diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveAsyncProductsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveAsyncProductsTesterBase.ref.cpp
index 3e1d1f4de..9bdebe890 100644
--- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveAsyncProductsTesterBase.ref.cpp
+++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveAsyncProductsTesterBase.ref.cpp
@@ -902,9 +902,8 @@ ActiveAsyncProductsTesterBase ::
   delete this->fromPortHistory_typedOut;
   delete this->fromPortHistory_typedReturnOut;
 
-  // Destroy product request history
+  // Destroy data product histories
   delete this->productRequestHistory;
-  // Destroy product send history
   delete this->productSendHistory;
 }
 
diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGetProductsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGetProductsTesterBase.ref.cpp
index 4697d2274..352f7081a 100644
--- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGetProductsTesterBase.ref.cpp
+++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGetProductsTesterBase.ref.cpp
@@ -867,7 +867,8 @@ ActiveGetProductsTesterBase ::
   delete this->fromPortHistory_typedOut;
   delete this->fromPortHistory_typedReturnOut;
 
-  // Destroy product send history
+  // Destroy data product histories
+  delete this->productGetHistory;
   delete this->productSendHistory;
 }
 
diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGuardedProductsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGuardedProductsTesterBase.ref.cpp
index 8f89927ed..d49fe47e0 100644
--- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGuardedProductsTesterBase.ref.cpp
+++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveGuardedProductsTesterBase.ref.cpp
@@ -902,9 +902,8 @@ ActiveGuardedProductsTesterBase ::
   delete this->fromPortHistory_typedOut;
   delete this->fromPortHistory_typedReturnOut;
 
-  // Destroy product request history
+  // Destroy data product histories
   delete this->productRequestHistory;
-  // Destroy product send history
   delete this->productSendHistory;
 }
 
diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSyncProductsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSyncProductsTesterBase.ref.cpp
index 40462863a..974f76e8d 100644
--- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSyncProductsTesterBase.ref.cpp
+++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveSyncProductsTesterBase.ref.cpp
@@ -902,9 +902,8 @@ ActiveSyncProductsTesterBase ::
   delete this->fromPortHistory_typedOut;
   delete this->fromPortHistory_typedReturnOut;
 
-  // Destroy product request history
+  // Destroy data product histories
   delete this->productRequestHistory;
-  // Destroy product send history
   delete this->productSendHistory;
 }
 
diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.cpp
index 5f8e5431a..48ccf87aa 100644
--- a/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.cpp
+++ b/compiler/tools/fpp-to-cpp/test/component/test-base/ActiveTestTesterBase.ref.cpp
@@ -1167,9 +1167,8 @@ namespace M {
     delete this->tlmHistory_ChannelU32OnChange;
     delete this->tlmHistory_ChannelEnumOnChange;
 
-    // Destroy product request history
+    // Destroy data product histories
     delete this->productRequestHistory;
-    // Destroy product send history
     delete this->productSendHistory;
   }
 
diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGetProductsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGetProductsTesterBase.ref.cpp
index dbfb18511..4a13c46ac 100644
--- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGetProductsTesterBase.ref.cpp
+++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGetProductsTesterBase.ref.cpp
@@ -692,7 +692,8 @@ PassiveGetProductsTesterBase ::
   delete this->fromPortHistory_typedOut;
   delete this->fromPortHistory_typedReturnOut;
 
-  // Destroy product send history
+  // Destroy data product histories
+  delete this->productGetHistory;
   delete this->productSendHistory;
 }
 
diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGuardedProductsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGuardedProductsTesterBase.ref.cpp
index cd0bfdc14..ac6ec49e3 100644
--- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGuardedProductsTesterBase.ref.cpp
+++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveGuardedProductsTesterBase.ref.cpp
@@ -727,9 +727,8 @@ PassiveGuardedProductsTesterBase ::
   delete this->fromPortHistory_typedOut;
   delete this->fromPortHistory_typedReturnOut;
 
-  // Destroy product request history
+  // Destroy data product histories
   delete this->productRequestHistory;
-  // Destroy product send history
   delete this->productSendHistory;
 }
 
diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSyncProductsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSyncProductsTesterBase.ref.cpp
index 93831599e..41537e333 100644
--- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSyncProductsTesterBase.ref.cpp
+++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveSyncProductsTesterBase.ref.cpp
@@ -727,9 +727,8 @@ PassiveSyncProductsTesterBase ::
   delete this->fromPortHistory_typedOut;
   delete this->fromPortHistory_typedReturnOut;
 
-  // Destroy product request history
+  // Destroy data product histories
   delete this->productRequestHistory;
-  // Destroy product send history
   delete this->productSendHistory;
 }
 
diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.cpp
index 73b5ef361..968c22538 100644
--- a/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.cpp
+++ b/compiler/tools/fpp-to-cpp/test/component/test-base/PassiveTestTesterBase.ref.cpp
@@ -990,9 +990,8 @@ PassiveTestTesterBase ::
   delete this->tlmHistory_ChannelU32OnChange;
   delete this->tlmHistory_ChannelEnumOnChange;
 
-  // Destroy product request history
+  // Destroy data product histories
   delete this->productRequestHistory;
-  // Destroy product send history
   delete this->productSendHistory;
 }
 
diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedAsyncProductsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedAsyncProductsTesterBase.ref.cpp
index 2e6056ee4..19b655c28 100644
--- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedAsyncProductsTesterBase.ref.cpp
+++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedAsyncProductsTesterBase.ref.cpp
@@ -902,9 +902,8 @@ QueuedAsyncProductsTesterBase ::
   delete this->fromPortHistory_typedOut;
   delete this->fromPortHistory_typedReturnOut;
 
-  // Destroy product request history
+  // Destroy data product histories
   delete this->productRequestHistory;
-  // Destroy product send history
   delete this->productSendHistory;
 }
 
diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGetProductsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGetProductsTesterBase.ref.cpp
index 055213cf9..c06fcdf5d 100644
--- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGetProductsTesterBase.ref.cpp
+++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGetProductsTesterBase.ref.cpp
@@ -867,7 +867,8 @@ QueuedGetProductsTesterBase ::
   delete this->fromPortHistory_typedOut;
   delete this->fromPortHistory_typedReturnOut;
 
-  // Destroy product send history
+  // Destroy data product histories
+  delete this->productGetHistory;
   delete this->productSendHistory;
 }
 
diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGuardedProductsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGuardedProductsTesterBase.ref.cpp
index 709cbe683..807503cf3 100644
--- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGuardedProductsTesterBase.ref.cpp
+++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedGuardedProductsTesterBase.ref.cpp
@@ -902,9 +902,8 @@ QueuedGuardedProductsTesterBase ::
   delete this->fromPortHistory_typedOut;
   delete this->fromPortHistory_typedReturnOut;
 
-  // Destroy product request history
+  // Destroy data product histories
   delete this->productRequestHistory;
-  // Destroy product send history
   delete this->productSendHistory;
 }
 
diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSyncProductsTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSyncProductsTesterBase.ref.cpp
index b915df908..5d4d8bf52 100644
--- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSyncProductsTesterBase.ref.cpp
+++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedSyncProductsTesterBase.ref.cpp
@@ -902,9 +902,8 @@ QueuedSyncProductsTesterBase ::
   delete this->fromPortHistory_typedOut;
   delete this->fromPortHistory_typedReturnOut;
 
-  // Destroy product request history
+  // Destroy data product histories
   delete this->productRequestHistory;
-  // Destroy product send history
   delete this->productSendHistory;
 }
 
diff --git a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.cpp
index cdaa6d660..6f687ab31 100644
--- a/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.cpp
+++ b/compiler/tools/fpp-to-cpp/test/component/test-base/QueuedTestTesterBase.ref.cpp
@@ -1165,9 +1165,8 @@ QueuedTestTesterBase ::
   delete this->tlmHistory_ChannelU32OnChange;
   delete this->tlmHistory_ChannelEnumOnChange;
 
-  // Destroy product request history
+  // Destroy data product histories
   delete this->productRequestHistory;
-  // Destroy product send history
   delete this->productSendHistory;
 }