diff --git a/Cargo.lock b/Cargo.lock
index a2d351e..3efe1c5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "ahash"
-version = "0.8.8"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff"
+checksum = "d713b3834d76b85304d4d525563c1276e2e30dc97cc67bfb4585a4a29fc2c89f"
 dependencies = [
  "cfg-if",
  "getrandom",
@@ -28,7 +28,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3"
 dependencies = [
  "concurrent-queue",
- "event-listener 5.0.0",
+ "event-listener 5.1.0",
  "event-listener-strategy 0.5.0",
  "futures-core",
  "pin-project-lite",
@@ -81,7 +81,7 @@ dependencies = [
 [[package]]
 name = "bevy_ecs"
 version = "0.14.0-dev"
-source = "git+https://github.com/bevyengine/bevy?branch=main#2701188f43b6c1015e4e5ef558862690012db782"
+source = "git+https://github.com/james7132/bevy?branch=nonmax-sparse-set#56a76852f83de268c5a581bd775678845e113121"
 dependencies = [
  "async-channel",
  "bevy_ecs_macros",
@@ -91,6 +91,7 @@ dependencies = [
  "bevy_utils",
  "downcast-rs",
  "fixedbitset",
+ "nonmax",
  "rustc-hash",
  "serde",
  "thiserror",
@@ -99,7 +100,7 @@ dependencies = [
 [[package]]
 name = "bevy_ecs_macros"
 version = "0.14.0-dev"
-source = "git+https://github.com/bevyengine/bevy?branch=main#2701188f43b6c1015e4e5ef558862690012db782"
+source = "git+https://github.com/james7132/bevy?branch=nonmax-sparse-set#56a76852f83de268c5a581bd775678845e113121"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -110,7 +111,7 @@ dependencies = [
 [[package]]
 name = "bevy_macro_utils"
 version = "0.14.0-dev"
-source = "git+https://github.com/bevyengine/bevy?branch=main#2701188f43b6c1015e4e5ef558862690012db782"
+source = "git+https://github.com/james7132/bevy?branch=nonmax-sparse-set#56a76852f83de268c5a581bd775678845e113121"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -122,12 +123,12 @@ dependencies = [
 [[package]]
 name = "bevy_ptr"
 version = "0.14.0-dev"
-source = "git+https://github.com/bevyengine/bevy?branch=main#2701188f43b6c1015e4e5ef558862690012db782"
+source = "git+https://github.com/james7132/bevy?branch=nonmax-sparse-set#56a76852f83de268c5a581bd775678845e113121"
 
 [[package]]
 name = "bevy_reflect"
 version = "0.14.0-dev"
-source = "git+https://github.com/bevyengine/bevy?branch=main#2701188f43b6c1015e4e5ef558862690012db782"
+source = "git+https://github.com/james7132/bevy?branch=nonmax-sparse-set#56a76852f83de268c5a581bd775678845e113121"
 dependencies = [
  "bevy_ptr",
  "bevy_reflect_derive",
@@ -141,7 +142,7 @@ dependencies = [
 [[package]]
 name = "bevy_reflect_derive"
 version = "0.14.0-dev"
-source = "git+https://github.com/bevyengine/bevy?branch=main#2701188f43b6c1015e4e5ef558862690012db782"
+source = "git+https://github.com/james7132/bevy?branch=nonmax-sparse-set#56a76852f83de268c5a581bd775678845e113121"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -153,7 +154,7 @@ dependencies = [
 [[package]]
 name = "bevy_tasks"
 version = "0.14.0-dev"
-source = "git+https://github.com/bevyengine/bevy?branch=main#2701188f43b6c1015e4e5ef558862690012db782"
+source = "git+https://github.com/james7132/bevy?branch=nonmax-sparse-set#56a76852f83de268c5a581bd775678845e113121"
 dependencies = [
  "async-channel",
  "async-executor",
@@ -166,7 +167,7 @@ dependencies = [
 [[package]]
 name = "bevy_utils"
 version = "0.14.0-dev"
-source = "git+https://github.com/bevyengine/bevy?branch=main#2701188f43b6c1015e4e5ef558862690012db782"
+source = "git+https://github.com/james7132/bevy?branch=nonmax-sparse-set#56a76852f83de268c5a581bd775678845e113121"
 dependencies = [
  "ahash",
  "bevy_utils_proc_macros",
@@ -185,7 +186,7 @@ dependencies = [
 [[package]]
 name = "bevy_utils_proc_macros"
 version = "0.14.0-dev"
-source = "git+https://github.com/bevyengine/bevy?branch=main#2701188f43b6c1015e4e5ef558862690012db782"
+source = "git+https://github.com/james7132/bevy?branch=nonmax-sparse-set#56a76852f83de268c5a581bd775678845e113121"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -194,9 +195,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.14.0"
+version = "3.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b"
 
 [[package]]
 name = "cfg-if"
@@ -233,9 +234,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "erased-serde"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55d05712b2d8d88102bc9868020c9e5c7a1f5527c452b9b97450a1d006140ba7"
+checksum = "388979d208a049ffdfb22fa33b9c81942215b940910bccfe258caeb25d125cb3"
 dependencies = [
  "serde",
 ]
@@ -253,9 +254,9 @@ dependencies = [
 
 [[package]]
 name = "event-listener"
-version = "5.0.0"
+version = "5.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b72557800024fabbaa2449dd4bf24e37b93702d457a4d4f2b0dd1f0f039f20c1"
+checksum = "b7ad6fd685ce13acd6d9541a30f6db6567a7a24c9ffd4ba2955d29e3f22c8b27"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -278,7 +279,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291"
 dependencies = [
- "event-listener 5.0.0",
+ "event-listener 5.1.0",
  "pin-project-lite",
 ]
 
@@ -440,18 +441,18 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "serde"
-version = "1.0.196"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.196"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -478,9 +479,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -509,9 +510,9 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
  "cfg-if",
  "once_cell",
diff --git a/Cargo.toml b/Cargo.toml
index ea3d16e..0800eac 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-bevy_ecs = { git = "https://github.com/bevyengine/bevy", branch = "main" }
+bevy_ecs = { git = "https://github.com/james7132/bevy", branch = "nonmax-sparse-set" }
 
 [profile.release]
 opt-level = 3
diff --git a/results/command_queue_apply.s b/results/command_queue_apply.s
index db5300b..3ea153e 100644
--- a/results/command_queue_apply.s
+++ b/results/command_queue_apply.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"command_queue_apply.16232369323dabc1-cgu.0"
+	.file	"command_queue_apply.6c6ffbd63d8de4a3-cgu.0"
 	.section	.text.command_queue_apply,"ax",@progbits
 	.globl	command_queue_apply
 	.p2align	4, 0x90
diff --git a/results/entity_insert.s b/results/entity_insert.s
index 2092139..351f8be 100644
--- a/results/entity_insert.s
+++ b/results/entity_insert.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"entity_insert.d436241fb43ad779-cgu.0"
+	.file	"entity_insert.970f06c1484fe6f-cgu.0"
 	.section	.text.alloc::raw_vec::finish_grow,"ax",@progbits
 	.p2align	4, 0x90
 	.type	alloc::raw_vec::finish_grow,@function
@@ -94,17 +94,16 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	cmpq	$5, %rsi
 	movl	$4, %r14d
 	cmovaeq	%rsi, %r14
+	movabsq	$104811045873349726, %rcx
 	xorl	%esi, %esi
-	movq	%r14, %rcx
-	shrq	$58, %rcx
-	sete	%sil
-	movq	%r14, %rdx
-	shlq	$5, %rdx
+	cmpq	%rcx, %r14
+	setb	%sil
+	imulq	$88, %r14, %rdx
 	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB1_2
 	movq	8(%rbx), %rcx
-	shlq	$5, %rax
+	imulq	$88, %rax, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -175,16 +174,17 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	cmpq	$5, %rsi
 	movl	$4, %r14d
 	cmovaeq	%rsi, %r14
-	movabsq	$104811045873349726, %rcx
 	xorl	%esi, %esi
-	cmpq	%rcx, %r14
-	setb	%sil
-	imulq	$88, %r14, %rdx
+	movq	%r14, %rcx
+	shrq	$58, %rcx
+	sete	%sil
+	movq	%r14, %rdx
+	shlq	$5, %rdx
 	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB2_2
 	movq	8(%rbx), %rcx
-	imulq	$88, %rax, %rax
+	shlq	$5, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -1398,7 +1398,7 @@ hashbrown::raw::inner::RawTable<T,A>::reserve_rehash:
 	.section	.rodata.cst16,"aM",@progbits,16
 	.p2align	4, 0x0
 .LCPI7_0:
-	.zero	16,29
+	.zero	16,34
 	.section	.text.entity_insert,"ax",@progbits
 	.globl	entity_insert
 	.p2align	4, 0x90
@@ -1429,8 +1429,8 @@ entity_insert:
 	.cfi_offset %r15, -24
 	.cfi_offset %rbp, -16
 	movss	%xmm0, 4(%rsp)
-	movabsq	$-1575265730374717256, %r12
-	movabsq	$4286417166700965122, %rbx
+	movabsq	$537721330589770166, %r12
+	movabsq	$5025804693211550775, %rbx
 	movq	%rbx, %r13
 	movq	%rdi, 16(%rsp)
 	movq	(%rdi), %r14
@@ -1580,10 +1580,10 @@ entity_insert:
 	movq	56(%rdx), %rsi
 	testq	%rsi, %rsi
 	je	.LBB7_67
-	shlq	$4, %rcx
-	cmpq	$0, (%rsi,%rcx)
+	movq	(%rsi,%rcx,8), %rcx
+	testq	%rcx, %rcx
 	je	.LBB7_65
-	movq	8(%rsi,%rcx), %rcx
+	notq	%rcx
 	leaq	(%rcx,%rcx,2), %r12
 	shlq	$5, %r12
 	addq	24(%rdx), %r12
@@ -1772,8 +1772,8 @@ entity_insert:
 	subq	%rcx, 528(%r14)
 	leaq	-16(%rax), %rcx
 	andq	%rbp, %rcx
-	movb	$29, (%r15,%rax)
-	movb	$29, 16(%rcx,%r15)
+	movb	$34, (%r15,%rax)
+	movb	$34, 16(%rcx,%r15)
 	incq	536(%r14)
 	negq	%rax
 	leaq	(%rax,%rax,2), %rax
@@ -1848,10 +1848,10 @@ entity_insert:
 	movq	56(%rdx), %rsi
 	testq	%rsi, %rsi
 	je	.LBB7_99
-	shlq	$4, %rcx
-	cmpq	$0, (%rsi,%rcx)
+	movq	(%rsi,%rcx,8), %rcx
+	testq	%rcx, %rcx
 	je	.LBB7_97
-	movq	8(%rsi,%rcx), %rcx
+	notq	%rcx
 	leaq	(%rcx,%rcx,2), %r12
 	shlq	$5, %r12
 	addq	24(%rdx), %r12
@@ -1991,10 +1991,10 @@ entity_insert:
 	movq	56(%rsi), %rdx
 	testq	%rdx, %rdx
 	je	.LBB7_125
-	shlq	$4, %rcx
-	cmpq	$0, (%rdx,%rcx)
+	movq	(%rdx,%rcx,8), %rcx
+	testq	%rcx, %rcx
 	je	.LBB7_123
-	movq	8(%rdx,%rcx), %rcx
+	notq	%rcx
 	leaq	(%rcx,%rcx,2), %r13
 	shlq	$5, %r13
 	addq	24(%rsi), %r13
@@ -2147,8 +2147,8 @@ entity_insert:
 	subq	%rsi, 104(%r14)
 	leaq	-16(%rdx), %rsi
 	andq	%rcx, %rsi
-	movb	$29, (%rax,%rdx)
-	movb	$29, 16(%rsi,%rax)
+	movb	$34, (%rax,%rdx)
+	movb	$34, 16(%rsi,%rax)
 	incq	112(%r14)
 	negq	%rdx
 	leaq	(%rdx,%rdx,2), %rcx
@@ -2300,7 +2300,7 @@ GCC_except_table7:
 	.type	.Lanon.83959b72e5b8236df4a28836bf490603.2,@object
 	.section	.rodata..Lanon.83959b72e5b8236df4a28836bf490603.2,"a",@progbits
 .Lanon.83959b72e5b8236df4a28836bf490603.2:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/2701188/crates/bevy_ecs/src/archetype.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-11a63d9ba653d13e/56a7685/crates/bevy_ecs/src/archetype.rs"
 	.size	.Lanon.83959b72e5b8236df4a28836bf490603.2, 95
 
 	.type	.Lanon.83959b72e5b8236df4a28836bf490603.3,@object
diff --git a/results/entity_remove.s b/results/entity_remove.s
index 8e298e6..c7dbc00 100644
--- a/results/entity_remove.s
+++ b/results/entity_remove.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"entity_remove.cb74b3775d8b00b1-cgu.0"
+	.file	"entity_remove.dc37ed33c13e703c-cgu.0"
 	.section	.text.alloc::raw_vec::finish_grow,"ax",@progbits
 	.p2align	4, 0x90
 	.type	alloc::raw_vec::finish_grow,@function
@@ -96,15 +96,14 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	cmovaeq	%rsi, %r14
 	xorl	%esi, %esi
 	movq	%r14, %rcx
-	shrq	$58, %rcx
+	shrq	$60, %rcx
 	sete	%sil
-	movq	%r14, %rdx
-	shlq	$5, %rdx
+	leaq	(,%r14,8), %rdx
 	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB1_2
 	movq	8(%rbx), %rcx
-	shlq	$5, %rax
+	shlq	$3, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -177,14 +176,15 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	cmovaeq	%rsi, %r14
 	xorl	%esi, %esi
 	movq	%r14, %rcx
-	shrq	$60, %rcx
+	shrq	$58, %rcx
 	sete	%sil
-	leaq	(,%r14,8), %rdx
+	movq	%r14, %rdx
+	shlq	$5, %rdx
 	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB2_2
 	movq	8(%rbx), %rcx
-	shlq	$3, %rax
+	shlq	$5, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -1317,7 +1317,7 @@ hashbrown::raw::inner::RawTable<T,A>::reserve_rehash:
 	.section	.rodata.cst16,"aM",@progbits,16
 	.p2align	4, 0x0
 .LCPI6_0:
-	.zero	16,14
+	.zero	16,34
 	.section	.text.entity_remove,"ax",@progbits
 	.globl	entity_remove
 	.p2align	4, 0x90
@@ -1347,8 +1347,8 @@ entity_remove:
 	.cfi_offset %r14, -32
 	.cfi_offset %r15, -24
 	.cfi_offset %rbp, -16
-	movabsq	$-4624549582005454261, %r13
-	movabsq	$2060143948710776044, %rbx
+	movabsq	$-8491117217875847667, %r13
+	movabsq	$4966960701618665151, %rbx
 	movq	%rbx, %r12
 	movq	%rdi, 104(%rsp)
 	movq	(%rdi), %rbp
@@ -1579,8 +1579,8 @@ entity_remove:
 	subq	%rcx, 528(%rbp)
 	leaq	-16(%rax), %rcx
 	andq	%r15, %rcx
-	movb	$14, (%r14,%rax)
-	movb	$14, 16(%rcx,%r14)
+	movb	$34, (%r14,%rax)
+	movb	$34, 16(%rcx,%r14)
 	incq	536(%rbp)
 	negq	%rax
 	leaq	(%rax,%rax,2), %rax
@@ -1688,8 +1688,8 @@ entity_remove:
 	subq	%rsi, 104(%rbp)
 	leaq	-16(%rdx), %rsi
 	andq	%rcx, %rsi
-	movb	$14, (%rax,%rdx)
-	movb	$14, 16(%rsi,%rax)
+	movb	$34, (%rax,%rdx)
+	movb	$34, 16(%rsi,%rax)
 	incq	112(%rbp)
 	negq	%rdx
 	leaq	(%rdx,%rdx,2), %rcx
diff --git a/results/entity_take.s b/results/entity_take.s
index 4941147..f2b1cd8 100644
--- a/results/entity_take.s
+++ b/results/entity_take.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"entity_take.b396e4f083f63a14-cgu.0"
+	.file	"entity_take.335b5aa37f9ac4f7-cgu.0"
 	.section	.text.alloc::raw_vec::finish_grow,"ax",@progbits
 	.p2align	4, 0x90
 	.type	alloc::raw_vec::finish_grow,@function
@@ -94,16 +94,17 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	cmpq	$5, %rsi
 	movl	$4, %r14d
 	cmovaeq	%rsi, %r14
-	movabsq	$104811045873349726, %rcx
 	xorl	%esi, %esi
-	cmpq	%rcx, %r14
-	setb	%sil
-	imulq	$88, %r14, %rdx
+	movq	%r14, %rcx
+	shrq	$59, %rcx
+	sete	%sil
+	movq	%r14, %rdx
+	shlq	$4, %rdx
 	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB1_2
 	movq	8(%rbx), %rcx
-	imulq	$88, %rax, %rax
+	shlq	$4, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -174,16 +175,16 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	cmpq	$5, %rsi
 	movl	$4, %r14d
 	cmovaeq	%rsi, %r14
+	movabsq	$104811045873349726, %rcx
 	xorl	%esi, %esi
-	movq	%r14, %rcx
-	shrq	$60, %rcx
-	sete	%sil
-	leaq	(,%r14,8), %rdx
+	cmpq	%rcx, %r14
+	setb	%sil
+	imulq	$88, %r14, %rdx
 	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB2_2
 	movq	8(%rbx), %rcx
-	shlq	$3, %rax
+	imulq	$88, %rax, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -254,18 +255,17 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	cmpq	$5, %rsi
 	movl	$4, %r14d
 	cmovaeq	%rsi, %r14
-	movabsq	$128102389400760776, %rcx
 	xorl	%esi, %esi
-	cmpq	%rcx, %r14
-	setb	%sil
-	leaq	(,%r14,8), %rcx
-	leaq	(%rcx,%rcx,8), %rdx
+	movq	%r14, %rcx
+	shrq	$58, %rcx
+	sete	%sil
+	movq	%r14, %rdx
+	shlq	$5, %rdx
 	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB3_2
 	movq	8(%rbx), %rcx
-	shlq	$3, %rax
-	leaq	(%rax,%rax,8), %rax
+	shlq	$5, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -336,17 +336,18 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	cmpq	$5, %rsi
 	movl	$4, %r14d
 	cmovaeq	%rsi, %r14
+	movabsq	$128102389400760776, %rcx
 	xorl	%esi, %esi
-	movq	%r14, %rcx
-	shrq	$58, %rcx
-	sete	%sil
-	movq	%r14, %rdx
-	shlq	$5, %rdx
+	cmpq	%rcx, %r14
+	setb	%sil
+	leaq	(,%r14,8), %rcx
+	leaq	(%rcx,%rcx,8), %rdx
 	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB4_2
 	movq	8(%rbx), %rcx
-	shlq	$5, %rax
+	shlq	$3, %rax
+	leaq	(%rax,%rax,8), %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -500,15 +501,14 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	cmovaeq	%rsi, %r14
 	xorl	%esi, %esi
 	movq	%r14, %rcx
-	shrq	$59, %rcx
+	shrq	$60, %rcx
 	sete	%sil
-	movq	%r14, %rdx
-	shlq	$4, %rdx
+	leaq	(,%r14,8), %rdx
 	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB6_2
 	movq	8(%rbx), %rcx
-	shlq	$4, %rax
+	shlq	$3, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -581,15 +581,14 @@ alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle:
 	cmovaeq	%rsi, %r14
 	xorl	%esi, %esi
 	movq	%r14, %rcx
-	shrq	$59, %rcx
+	shrq	$60, %rcx
 	sete	%sil
-	movq	%r14, %rdx
-	shlq	$4, %rdx
+	leaq	(,%r14,8), %rdx
 	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB7_2
 	movq	8(%rbx), %rcx
-	shlq	$4, %rax
+	shlq	$3, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -1124,14 +1123,14 @@ hashbrown::raw::inner::RawTable<T,A>::reserve_rehash:
 	retq
 .LBB8_12:
 	.cfi_def_cfa_offset 128
-	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.29(%rip), %rax
+	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.30(%rip), %rax
 	movq	%rax, 8(%rsp)
 	movq	$1, 16(%rsp)
 	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.0(%rip), %rax
 	movq	%rax, 24(%rsp)
 	xorps	%xmm0, %xmm0
 	movups	%xmm0, 32(%rsp)
-	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.31(%rip), %rsi
+	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.32(%rip), %rsi
 	leaq	8(%rsp), %rdi
 	callq	*core::panicking::panic_fmt@GOTPCREL(%rip)
 .Lfunc_end8:
@@ -1625,14 +1624,14 @@ hashbrown::raw::inner::RawTable<T,A>::reserve_rehash:
 	retq
 .LBB9_12:
 	.cfi_def_cfa_offset 128
-	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.29(%rip), %rax
+	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.30(%rip), %rax
 	movq	%rax, 8(%rsp)
 	movq	$1, 16(%rsp)
 	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.0(%rip), %rax
 	movq	%rax, 24(%rsp)
 	xorps	%xmm0, %xmm0
 	movups	%xmm0, 32(%rsp)
-	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.31(%rip), %rsi
+	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.32(%rip), %rsi
 	leaq	8(%rsp), %rdi
 	callq	*core::panicking::panic_fmt@GOTPCREL(%rip)
 .Lfunc_end9:
@@ -1642,7 +1641,7 @@ hashbrown::raw::inner::RawTable<T,A>::reserve_rehash:
 	.section	.rodata.cst16,"aM",@progbits,16
 	.p2align	4, 0x0
 .LCPI10_0:
-	.zero	16,13
+	.zero	16,49
 	.section	.text.entity_remove,"ax",@progbits
 	.globl	entity_remove
 	.p2align	4, 0x90
@@ -1664,36 +1663,36 @@ entity_remove:
 	.cfi_def_cfa_offset 48
 	pushq	%rbx
 	.cfi_def_cfa_offset 56
-	subq	$152, %rsp
-	.cfi_def_cfa_offset 208
+	subq	$168, %rsp
+	.cfi_def_cfa_offset 224
 	.cfi_offset %rbx, -56
 	.cfi_offset %r12, -48
 	.cfi_offset %r13, -40
 	.cfi_offset %r14, -32
 	.cfi_offset %r15, -24
 	.cfi_offset %rbp, -16
-	movq	%rdi, %rbp
-	movabsq	$-6021479545938932290, %r13
-	movabsq	$2005371237053781301, %rbx
-	movq	%rbx, %r14
+	movq	%rdi, %rbx
+	movabsq	$-1287157004845164057, %r13
+	movabsq	$7164499144494956449, %r15
+	movq	%r15, %r14
 	movq	(%rdi), %rax
 	leaq	488(%rax), %rcx
-	movq	%rcx, 56(%rsp)
+	movq	%rcx, 48(%rsp)
 	leaq	64(%rax), %rcx
-	movq	%rcx, 16(%rsp)
+	movq	%rcx, 32(%rsp)
 	leaq	216(%rax), %rcx
-	movq	%rcx, 48(%rsp)
-	movq	512(%rax), %r15
+	movq	%rcx, 56(%rsp)
+	movq	512(%rax), %r12
 	movq	%rax, 8(%rsp)
-	movq	520(%rax), %r12
-	leaq	-24(%r15), %rax
+	movq	520(%rax), %rbp
+	leaq	-24(%r12), %rax
 	xorl	%ecx, %ecx
 	movdqa	.LCPI10_0(%rip), %xmm0
 	pcmpeqd	%xmm1, %xmm1
-	movq	%rbx, %rdx
+	movq	%r15, %rdx
 .LBB10_1:
-	andq	%r12, %rdx
-	movdqu	(%r15,%rdx), %xmm2
+	andq	%rbp, %rdx
+	movdqu	(%r12,%rdx), %xmm2
 	movdqa	%xmm2, %xmm3
 	pcmpeqb	%xmm0, %xmm3
 	pmovmskb	%xmm3, %esi
@@ -1705,13 +1704,13 @@ entity_remove:
 	andl	%esi, %r8d
 	rep		bsfl	%esi, %esi
 	addq	%rdx, %rsi
-	andq	%r12, %rsi
+	andq	%rbp, %rsi
 	negq	%rsi
 	leaq	(%rsi,%rsi,2), %rdi
 	movq	8(%rax,%rdi,8), %rsi
 	xorq	%r13, %rsi
 	movq	(%rax,%rdi,8), %r9
-	xorq	%rbx, %r9
+	xorq	%r15, %r9
 	orq	%rsi, %r9
 	movl	%r8d, %esi
 	jne	.LBB10_2
@@ -1727,131 +1726,119 @@ entity_remove:
 	addq	$16, %rcx
 	jmp	.LBB10_1
 .LBB10_6:
-	movq	-8(%r15,%rdi,8), %r14
+	movq	-8(%r12,%rdi,8), %r14
+	movq	8(%rsp), %r15
 .LBB10_7:
 	shlq	$5, %r14
-	movq	8(%rsp), %r15
 	addq	496(%r15), %r14
-	movl	16(%rbp), %r13d
-	movl	20(%rbp), %r12d
-	movl	24(%rbp), %eax
-	movq	%rax, 24(%rsp)
-	movl	28(%rbp), %eax
-	movq	%rax, 56(%rsp)
+	movl	16(%rbx), %r13d
+	movl	20(%rbx), %eax
+	movq	%rax, 16(%rsp)
+	movl	24(%rbx), %ebp
+	movq	%rbx, 48(%rsp)
+	movl	28(%rbx), %r12d
 	leaq	152(%r15), %rdi
 	xorl	%ebx, %ebx
-	movq	48(%rsp), %rsi
-	movq	16(%rsp), %rdx
+	movq	56(%rsp), %rsi
+	movq	32(%rsp), %rdx
 	movl	%r13d, %ecx
 	movq	%r14, %r8
 	xorl	%r9d, %r9d
 	callq	*bevy_ecs::world::entity_ref::remove_bundle_from_archetype@GOTPCREL(%rip)
 	testl	%eax, %eax
-	je	.LBB10_126
+	je	.LBB10_123
 	cmpl	%r13d, %edx
-	je	.LBB10_126
+	je	.LBB10_123
+	movq	%rbp, 136(%rsp)
 	movl	%edx, 40(%rsp)
+	movq	%r12, 128(%rsp)
 	cmpq	$0, 16(%r14)
-	je	.LBB10_127
-	movq	8(%rbp), %r11
+	je	.LBB10_124
+	movq	48(%rsp), %rax
+	movq	8(%rax), %r12
 	movq	8(%r14), %rax
-	movq	(%rax), %r14
+	movq	(%rax), %rbp
 	movq	72(%r15), %rax
-	movq	%rax, 32(%rsp)
-	movq	664(%r15), %rax
+	movq	%rax, 24(%rsp)
+	movq	664(%r15), %rbx
 	movq	672(%r15), %r15
-	cmpq	%r14, %r15
-	movq	%r11, 16(%rsp)
+	cmpq	%rbp, %r15
+	movq	%r12, 32(%rsp)
 	jbe	.LBB10_61
-	testq	%rax, %rax
+	testq	%rbx, %rbx
 	je	.LBB10_61
-	movq	%r14, %rcx
-	shlq	$4, %rcx
-	cmpq	$0, (%rax,%rcx)
+	movq	(%rbx,%rbp,8), %rax
+	testq	%rax, %rax
 	je	.LBB10_61
-	movq	8(%rax,%rcx), %rax
+	notq	%rax
 	leaq	(%rax,%rax,8), %rbx
 	shlq	$3, %rbx
-	movq	8(%rsp), %rax
-	addq	616(%rax), %rbx
+	movq	8(%rsp), %r15
+	addq	616(%r15), %rbx
 	movq	48(%rbx), %rsi
-	movq	64(%rbx), %r15
+	movq	64(%rbx), %r14
 	cmpq	32(%rbx), %rsi
-	je	.LBB10_77
-.LBB10_76:
-	movq	%r15, %rax
-	jmp	.LBB10_78
+	je	.LBB10_74
+.LBB10_73:
+	movq	%r14, %rax
+	jmp	.LBB10_75
 .LBB10_61:
 	pxor	%xmm0, %xmm0
-	movdqa	%xmm0, 128(%rsp)
+	movdqa	%xmm0, 144(%rsp)
 	movdqa	%xmm0, 64(%rsp)
 	movq	$0, 80(%rsp)
-	movq	8(%rsp), %rcx
-	movq	624(%rcx), %rbx
-	cmpq	%r14, %r15
-	ja	.LBB10_69
-	movq	%r14, %rdx
-	subq	%r15, %rdx
-	incq	%rdx
-	movq	656(%rcx), %rcx
-	subq	%r15, %rcx
-	cmpq	%rdx, %rcx
-	jb	.LBB10_63
-	movq	%r15, %rcx
-	testq	%rdx, %rdx
-	je	.LBB10_68
+	movq	8(%rsp), %rax
+	movq	624(%rax), %r12
+	cmpq	$-1, %r12
+	je	.LBB10_125
+	cmpq	%rbp, %r15
+	ja	.LBB10_66
+	movq	%rbp, %r14
+	subq	%r15, %r14
+	incq	%r14
+	movq	8(%rsp), %rax
+	movq	656(%rax), %rax
+	subq	%r15, %rax
+	cmpq	%r14, %rax
+	jb	.LBB10_64
 .LBB10_65:
-	movq	%rcx, %rdx
-	shlq	$4, %rdx
-	addq	%rax, %rdx
-	movq	%r14, %rsi
-	notq	%rsi
-	addq	%r15, %rsi
-	xorl	%edi, %edi
-	.p2align	4, 0x90
+	leaq	(%rbx,%r15,8), %rdi
+	leaq	(,%r14,8), %rdx
+	xorl	%esi, %esi
+	callq	*memset@GOTPCREL(%rip)
+	addq	%r14, %r15
+	movq	8(%rsp), %rax
+	movq	%r15, 672(%rax)
 .LBB10_66:
-	movq	$0, (%rdx)
-	decq	%rdi
-	addq	$16, %rdx
-	cmpq	%rdi, %rsi
-	jne	.LBB10_66
-	subq	%rdi, %rcx
-	movq	%rcx, %r15
-.LBB10_68:
-	movq	8(%rsp), %rcx
-	movq	%r15, 672(%rcx)
-.LBB10_69:
-	cmpq	%r14, %r15
-	jbe	.LBB10_128
-	movq	%r14, %rcx
-	shlq	$4, %rcx
-	movq	$1, (%rax,%rcx)
-	movq	%rbx, 8(%rax,%rcx)
+	cmpq	%rbp, %r15
+	jbe	.LBB10_126
+	movq	%r12, %rax
+	notq	%rax
+	movq	%rax, (%rbx,%rbp,8)
 	movq	8(%rsp), %r15
 	movq	648(%r15), %rsi
 	cmpq	632(%r15), %rsi
-	jne	.LBB10_72
+	jne	.LBB10_69
 	leaq	632(%r15), %rdi
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
 	movq	648(%r15), %rsi
-.LBB10_72:
+.LBB10_69:
 	movq	640(%r15), %rax
-	movq	%r14, (%rax,%rsi,8)
+	movq	%rbp, (%rax,%rsi,8)
 	incq	%rsi
 	movq	%rsi, 648(%r15)
 	movq	624(%r15), %rsi
 	cmpq	608(%r15), %rsi
-	jne	.LBB10_74
+	jne	.LBB10_71
 	leaq	608(%r15), %rdi
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
 	movq	624(%r15), %rsi
-.LBB10_74:
-	movq	16(%rsp), %r11
+.LBB10_71:
 	movq	616(%r15), %rax
 	leaq	(%rsi,%rsi,8), %rcx
 	movq	$0, (%rax,%rcx,8)
 	movq	$8, 8(%rax,%rcx,8)
-	movaps	128(%rsp), %xmm0
+	movaps	144(%rsp), %xmm0
 	movups	%xmm0, 16(%rax,%rcx,8)
 	movq	$0, 32(%rax,%rcx,8)
 	movq	$8, 40(%rax,%rcx,8)
@@ -1861,269 +1848,269 @@ entity_remove:
 	movq	%rdx, 64(%rax,%rcx,8)
 	incq	%rsi
 	movq	%rsi, 624(%r15)
-	leaq	(%rbx,%rbx,8), %rcx
+	leaq	(%r12,%r12,8), %rcx
 	leaq	(%rax,%rcx,8), %rbx
+	movq	32(%rsp), %r12
 	movq	48(%rbx), %rsi
-	movq	64(%rbx), %r15
+	movq	64(%rbx), %r14
 	cmpq	32(%rbx), %rsi
-	jne	.LBB10_76
-.LBB10_77:
+	jne	.LBB10_73
+.LBB10_74:
 	leaq	32(%rbx), %rdi
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
-	movq	16(%rsp), %r11
 	movq	48(%rbx), %rsi
 	movq	64(%rbx), %rax
-.LBB10_78:
+.LBB10_75:
 	movq	40(%rbx), %rcx
 	movq	%rsi, %rdx
 	shlq	$4, %rdx
-	movq	%r15, (%rcx,%rdx)
-	movq	%r11, 8(%rcx,%rdx)
+	movq	%r14, (%rcx,%rdx)
+	movq	%r12, 8(%rcx,%rdx)
 	incq	%rsi
 	movq	%rsi, 48(%rbx)
 	incq	%rax
 	movq	%rax, 64(%rbx)
-	imulq	$88, %r14, %rax
-	movq	32(%rsp), %rcx
+	imulq	$88, %rbp, %rax
+	movq	24(%rsp), %rcx
 	cmpb	$0, 72(%rcx,%rax)
-	je	.LBB10_79
-	movq	48(%rsp), %rdi
-	movq	%r14, %rsi
+	je	.LBB10_76
+	movq	56(%rsp), %rdi
+	movq	%rbp, %rsi
 	callq	*bevy_ecs::storage::sparse_set::SparseSets::get_mut@GOTPCREL(%rip)
 	testq	%rax, %rax
-	movq	8(%rsp), %r15
-	je	.LBB10_84
+	je	.LBB10_81
 	movq	%rax, %rdi
-	movq	16(%rsp), %rsi
+	movq	%r12, %rsi
 	callq	*bevy_ecs::storage::sparse_set::ComponentSparseSet::remove_and_forget@GOTPCREL(%rip)
 	testq	%rax, %rax
-	je	.LBB10_131
-	movq	296(%r15), %rdx
+	je	.LBB10_129
+	movq	296(%r15), %r14
 	movq	304(%r15), %rsi
-	movq	16(%rsp), %r11
-	movq	168(%r15), %r14
-	cmpq	%r13, %r14
-	jbe	.LBB10_132
-.LBB10_89:
-	movq	160(%r15), %rbx
-	imulq	$152, %r13, %rdi
-	movq	88(%rbx,%rdi), %rcx
-	cmpq	%r12, %rcx
-	jbe	.LBB10_133
+	movq	168(%r15), %rbx
+	cmpq	%r13, %rbx
+	jbe	.LBB10_130
+.LBB10_86:
+	movq	160(%r15), %rbp
+	imulq	$152, %r13, %r11
+	movq	88(%rbp,%r11), %rcx
+	movq	16(%rsp), %rdi
+	cmpq	%rdi, %rcx
+	jbe	.LBB10_131
 	movss	(%rax), %xmm1
-	leaq	(%rbx,%rdi), %r9
+	leaq	(%r11,%rbp), %r9
 	addq	$88, %r9
 	decq	%rcx
-	movq	80(%rbx,%rdi), %rax
-	movq	%r12, %r8
+	movq	80(%rbp,%r11), %rax
+	movq	%rdi, %r8
 	shlq	$4, %r8
 	movq	%rcx, %r10
 	shlq	$4, %r10
-	movl	8(%rax,%r8), %r13d
+	movl	8(%rax,%r8), %edx
 	movdqu	(%rax,%r10), %xmm0
 	movdqu	%xmm0, (%rax,%r8)
 	movq	%rcx, (%r9)
-	cmpq	%r12, %rcx
-	je	.LBB10_97
-	jbe	.LBB10_134
+	cmpq	%rdi, %rcx
+	je	.LBB10_94
+	jbe	.LBB10_132
 	addq	%r8, %rax
 	movl	4(%rax), %ecx
 	testl	%ecx, %ecx
-	je	.LBB10_97
+	je	.LBB10_94
 	movl	(%rax), %r8d
 	cmpq	%r8, 16(%r15)
-	jbe	.LBB10_140
+	jbe	.LBB10_138
 	movq	8(%r15), %rax
 	leaq	(%r8,%r8,4), %r8
 	cmpl	%ecx, (%rax,%r8,4)
-	jne	.LBB10_140
+	jne	.LBB10_138
 	cmpl	$-1, 4(%rax,%r8,4)
-	je	.LBB10_140
+	je	.LBB10_138
 	leaq	(%rax,%r8,4), %rax
 	addq	$4, %rax
-	movl	%r12d, 4(%rax)
-.LBB10_97:
+	movl	%edi, 4(%rax)
+.LBB10_94:
 	movl	40(%rsp), %eax
-	cmpq	%rax, %r14
-	jbe	.LBB10_135
-	movq	%r14, 40(%rsp)
-	movq	%rbp, 48(%rsp)
-	movq	%r11, %rbp
-	shrq	$32, %rbp
-	movl	148(%rbx,%rdi), %edi
+	cmpq	%rax, %rbx
+	jbe	.LBB10_133
+	movq	%r14, %r8
+	movq	%rbx, 40(%rsp)
+	movq	%r12, %rbx
+	shrq	$32, %rbx
+	movl	148(%rbp,%r11), %edi
 	imulq	$152, %rax, %r14
-	leaq	(%rbx,%r14), %r8
-	addq	$148, %r8
-	movl	148(%rbx,%r14), %eax
+	leaq	(%r14,%rbp), %r9
+	addq	$148, %r9
+	movl	148(%rbp,%r14), %eax
 	cmpl	%eax, %edi
-	jne	.LBB10_99
-	leaq	(%rbx,%r14), %r15
+	movl	%edx, 56(%rsp)
+	jne	.LBB10_96
+	movq	%r12, %r13
+	leaq	(%r14,%rbp), %r15
 	addq	$72, %r15
-	movq	88(%rbx,%r14), %r12
+	movq	88(%rbp,%r14), %r12
 	movq	%r12, %rax
-	cmpq	72(%rbx,%r14), %r12
-	jne	.LBB10_120
+	cmpq	72(%rbp,%r14), %r12
+	jne	.LBB10_117
 	movq	%r15, %rdi
 	movq	%r12, %rsi
 	movss	%xmm1, 24(%rsp)
-	movq	%r8, 32(%rsp)
+	movq	%r9, 16(%rsp)
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
-	movq	32(%rsp), %r8
+	movq	16(%rsp), %r9
 	movss	24(%rsp), %xmm1
-	movq	16(%rsp), %r11
 	movq	16(%r15), %rax
-.LBB10_120:
+.LBB10_117:
 	movq	8(%r15), %rcx
 	movq	%rax, %rdx
 	shlq	$4, %rdx
-	movl	%r11d, (%rcx,%rdx)
-	movl	%ebp, 4(%rcx,%rdx)
-	movl	%r13d, 8(%rcx,%rdx)
+	movq	%r13, %rsi
+	movl	%esi, (%rcx,%rdx)
+	movl	%ebx, 4(%rcx,%rdx)
+	movl	56(%rsp), %edi
+	movl	%edi, 8(%rcx,%rdx)
 	incq	%rax
 	movq	%rax, 16(%r15)
-	movl	144(%rbx,%r14), %ecx
-	movl	(%r8), %edx
+	movl	144(%rbp,%r14), %ecx
+	movl	(%r9), %edx
 	movq	48(%rsp), %r9
-	jmp	.LBB10_125
-.LBB10_99:
+	jmp	.LBB10_122
+.LBB10_96:
 	cmpl	%eax, %edi
 	movss	%xmm1, 24(%rsp)
-	movq	%r8, 32(%rsp)
-	jbe	.LBB10_100
+	movq	%r9, 16(%rsp)
+	jbe	.LBB10_97
 	cmpq	%rdi, %rsi
-	jb	.LBB10_137
-	je	.LBB10_117
+	jb	.LBB10_135
+	je	.LBB10_114
 	leaq	(%rdi,%rdi,8), %rcx
-	leaq	(%rdx,%rcx,8), %rsi
+	leaq	(%r8,%rcx,8), %rsi
 	leaq	(%rax,%rax,8), %rax
-	leaq	(%rdx,%rax,8), %rcx
-	jmp	.LBB10_104
-.LBB10_79:
-	movq	8(%rsp), %r15
+	leaq	(%r8,%rax,8), %rcx
+	jmp	.LBB10_101
+.LBB10_76:
 	movq	304(%r15), %rsi
-	movq	24(%rsp), %rdi
+	movq	136(%rsp), %rdi
 	cmpq	%rdi, %rsi
-	jbe	.LBB10_129
-	movq	296(%r15), %rdx
+	jbe	.LBB10_127
+	movq	296(%r15), %r14
 	leaq	(%rdi,%rdi,8), %rax
-	cmpq	%r14, 64(%rdx,%rax,8)
-	jbe	.LBB10_130
-	movq	56(%rdx,%rax,8), %rcx
+	cmpq	%rbp, 64(%r14,%rax,8)
+	jbe	.LBB10_128
+	movq	56(%r14,%rax,8), %rcx
+	testq	%rcx, %rcx
+	je	.LBB10_128
+	movq	(%rcx,%rbp,8), %rcx
 	testq	%rcx, %rcx
-	je	.LBB10_130
-	shlq	$4, %r14
-	cmpq	$0, (%rcx,%r14)
-	je	.LBB10_130
-	leaq	(%rdx,%rax,8), %rax
+	je	.LBB10_128
+	leaq	(%r14,%rax,8), %rax
 	addq	$24, %rax
 	movq	(%rax), %rdi
-	movq	8(%rcx,%r14), %rax
-	leaq	(%rax,%rax,2), %rcx
+	notq	%rcx
+	leaq	(%rcx,%rcx,2), %rcx
 	shlq	$5, %rcx
 	movq	8(%rdi,%rcx), %rax
-	imulq	56(%rsp), %rax
+	imulq	128(%rsp), %rax
 	addq	16(%rdi,%rcx), %rax
-	movq	168(%r15), %r14
-	cmpq	%r13, %r14
-	ja	.LBB10_89
-.LBB10_132:
+	movq	168(%r15), %rbx
+	cmpq	%r13, %rbx
+	ja	.LBB10_86
+.LBB10_130:
 	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.5(%rip), %rdx
 	movq	%r13, %rdi
-	movq	%r14, %rsi
+	movq	%rbx, %rsi
 	callq	*core::panicking::panic_bounds_check@GOTPCREL(%rip)
-.LBB10_100:
+.LBB10_97:
 	cmpq	%rax, %rsi
-	jb	.LBB10_136
+	jb	.LBB10_134
 	cmpl	%edi, %eax
-	jbe	.LBB10_114
+	jbe	.LBB10_111
 	cmpq	%rax, %rsi
-	je	.LBB10_115
+	je	.LBB10_112
 	leaq	(%rax,%rax,8), %rax
-	leaq	(%rdx,%rax,8), %rcx
+	leaq	(%r8,%rax,8), %rcx
 	leaq	(%rdi,%rdi,8), %rax
-	leaq	(%rdx,%rax,8), %rsi
-.LBB10_104:
+	leaq	(%r8,%rax,8), %rsi
+.LBB10_101:
 	leaq	64(%rsp), %rdi
-	movl	%r13d, 124(%rsp)
-	movl	%r13d, %edx
 	callq	*bevy_ecs::storage::table::Table::move_to_and_forget_missing_unchecked@GOTPCREL(%rip)
 	movl	72(%rsp), %r15d
-	leaq	(%rbx,%r14), %r13
+	leaq	(%r14,%rbp), %r13
 	addq	$72, %r13
-	movq	88(%rbx,%r14), %r12
+	movq	88(%rbp,%r14), %r12
 	movq	%r12, %rax
-	cmpq	72(%rbx,%r14), %r12
-	jne	.LBB10_106
+	cmpq	72(%rbp,%r14), %r12
+	jne	.LBB10_103
 	movq	%r13, %rdi
 	movq	%r12, %rsi
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
 	movq	16(%r13), %rax
-.LBB10_106:
+.LBB10_103:
 	movq	8(%r13), %rcx
 	movq	%rax, %rdx
 	shlq	$4, %rdx
-	movq	16(%rsp), %r11
-	movl	%r11d, (%rcx,%rdx)
-	movl	%ebp, 4(%rcx,%rdx)
+	movq	32(%rsp), %rsi
+	movl	%esi, (%rcx,%rdx)
+	movl	%ebx, 4(%rcx,%rdx)
 	movl	%r15d, 8(%rcx,%rdx)
 	incq	%rax
 	movq	%rax, 16(%r13)
-	movl	144(%rbx,%r14), %ecx
-	movq	32(%rsp), %rax
+	movl	144(%rbp,%r14), %ecx
+	movq	16(%rsp), %rax
 	movl	(%rax), %edx
 	movl	68(%rsp), %eax
 	testl	%eax, %eax
 	movq	48(%rsp), %r9
 	movss	24(%rsp), %xmm1
-	je	.LBB10_124
+	je	.LBB10_121
 	movl	64(%rsp), %edi
 	movq	8(%rsp), %rsi
 	cmpq	%rdi, 16(%rsi)
-	jbe	.LBB10_110
+	jbe	.LBB10_107
 	movq	8(%rsp), %rsi
 	movq	8(%rsi), %rsi
 	leaq	(%rdi,%rdi,4), %rdi
 	cmpl	%eax, (%rsi,%rdi,4)
-	jne	.LBB10_110
+	jne	.LBB10_107
 	movl	4(%rsi,%rdi,4), %eax
 	movl	$4294967295, %r8d
 	cmpq	%r8, %rax
-	je	.LBB10_110
+	je	.LBB10_107
 	leaq	(%rsi,%rdi,4), %rsi
 	addq	$4, %rsi
 	movl	4(%rsi), %edi
-	movq	56(%rsp), %r8
+	movq	128(%rsp), %r8
 	movl	%r8d, 12(%rsi)
 	movq	40(%rsp), %rsi
 	cmpq	%rax, %rsi
-	movl	124(%rsp), %r8d
-	jbe	.LBB10_138
+	movl	56(%rsp), %r8d
+	jbe	.LBB10_136
 	imulq	$152, %rax, %rax
-	movq	88(%rbx,%rax), %rsi
+	movq	88(%rbp,%rax), %rsi
 	cmpq	%rdi, %rsi
-	jbe	.LBB10_139
-	addq	%rbx, %rax
+	jbe	.LBB10_137
+	addq	%rbp, %rax
 	addq	$72, %rax
 	movq	8(%rax), %rax
 	shlq	$4, %rdi
 	movl	%r8d, 8(%rax,%rdi)
-.LBB10_124:
-	movl	%r15d, %r13d
-.LBB10_125:
+.LBB10_121:
+	movl	%r15d, %edi
+	movq	32(%rsp), %rsi
+.LBB10_122:
 	movl	%ecx, 16(%r9)
 	movl	%r12d, 20(%r9)
 	movl	%edx, 24(%r9)
-	movl	%r13d, 28(%r9)
+	movl	%edi, 28(%r9)
 	movq	8(%rsp), %rax
 	movq	8(%rax), %rax
-	movl	%r11d, %esi
+	movl	%esi, %esi
 	leaq	(%rsi,%rsi,4), %rsi
 	movl	%ecx, 4(%rax,%rsi,4)
 	movl	%r12d, 8(%rax,%rsi,4)
 	movl	%edx, 12(%rax,%rsi,4)
-	movl	%r13d, 16(%rax,%rsi,4)
+	movl	%edi, 16(%rax,%rsi,4)
 	movl	$1, %ebx
-.LBB10_126:
+.LBB10_123:
 	movl	%ebx, 64(%rsp)
 	movss	%xmm1, 68(%rsp)
 	leaq	64(%rsp), %rax
@@ -2131,7 +2118,7 @@ entity_remove:
 	#NO_APP
 	movl	64(%rsp), %eax
 	movss	68(%rsp), %xmm0
-	addq	$152, %rsp
+	addq	$168, %rsp
 	.cfi_def_cfa_offset 56
 	popq	%rbx
 	.cfi_def_cfa_offset 48
@@ -2147,22 +2134,22 @@ entity_remove:
 	.cfi_def_cfa_offset 8
 	retq
 .LBB10_14:
-	.cfi_def_cfa_offset 208
-	movq	$0, 96(%rsp)
-	leaq	104(%rsp), %rax
+	.cfi_def_cfa_offset 224
+	movq	$0, 104(%rsp)
+	leaq	112(%rsp), %rax
 	movq	%rax, 40(%rsp)
-	movq	$8, 104(%rsp)
-	movq	$0, 112(%rsp)
+	movq	$8, 112(%rsp)
+	movq	$0, 120(%rsp)
 	movq	8(%rsp), %rcx
 	leaq	88(%rcx), %rax
-	movq	%rax, 32(%rsp)
+	movq	%rax, 24(%rsp)
 	movq	88(%rcx), %rax
 	movq	96(%rcx), %rcx
 	leaq	-24(%rax), %rdx
 	xorl	%esi, %esi
 	pcmpeqd	%xmm1, %xmm1
 	movq	%r14, %rdi
-	movq	%r14, 24(%rsp)
+	movq	%r14, 16(%rsp)
 .LBB10_15:
 	andq	%rcx, %rdi
 	movdqu	(%rax,%rdi), %xmm2
@@ -2183,7 +2170,7 @@ entity_remove:
 	movq	8(%rdx,%r9,8), %r8
 	xorq	%r13, %r8
 	movq	(%rdx,%r9,8), %r11
-	xorq	%rbx, %r11
+	xorq	%r15, %r11
 	orq	%r8, %r11
 	movl	%r10d, %r8d
 	jne	.LBB10_16
@@ -2202,25 +2189,25 @@ entity_remove:
 	xorl	%esi, %esi
 .LBB10_38:
 .Ltmp4:
-	leaq	96(%rsp), %rdi
+	leaq	104(%rsp), %rdi
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
 .Ltmp5:
-	movq	112(%rsp), %rsi
+	movq	120(%rsp), %rsi
 .LBB10_40:
-	movq	104(%rsp), %rax
+	movq	112(%rsp), %rax
 	movq	%r14, (%rax,%rsi,8)
 	incq	%rsi
-	movq	%rsi, 112(%rsp)
+	movq	%rsi, 120(%rsp)
 	movq	8(%rsp), %rax
 	movq	504(%rax), %r14
-	movq	%rsi, 144(%rsp)
-	movdqu	96(%rsp), %xmm0
-	movdqa	%xmm0, 128(%rsp)
+	movq	%rsi, 160(%rsp)
+	movdqu	104(%rsp), %xmm0
+	movdqa	%xmm0, 144(%rsp)
 	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.18(%rip), %rsi
 	leaq	64(%rsp), %rdi
-	leaq	128(%rsp), %r8
+	leaq	144(%rsp), %r8
 	movl	$14, %edx
-	movq	16(%rsp), %rcx
+	movq	32(%rsp), %rcx
 	movq	%r14, %r9
 	callq	*bevy_ecs::bundle::BundleInfo::new@GOTPCREL(%rip)
 	movq	8(%rsp), %rsi
@@ -2228,14 +2215,14 @@ entity_remove:
 	cmpq	488(%rsi), %r14
 	jne	.LBB10_43
 .Ltmp7:
-	movq	56(%rsp), %rdi
+	movq	48(%rsp), %rdi
 	movq	%r14, %rsi
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
 .Ltmp8:
 	movq	8(%rsp), %rsi
 	movq	504(%rsi), %rax
-	movq	512(%rsi), %r15
-	movq	520(%rsi), %r12
+	movq	512(%rsi), %r12
+	movq	520(%rsi), %rbp
 .LBB10_43:
 	movq	496(%rsi), %rcx
 	movq	%rax, %rdx
@@ -2246,9 +2233,9 @@ entity_remove:
 	movups	%xmm0, (%rcx,%rdx)
 	incq	%rax
 	movq	%rax, 504(%rsi)
-	movq	%r12, %rcx
-	andq	%rbx, %rcx
-	movdqu	(%r15,%rcx), %xmm0
+	movq	%rbp, %rcx
+	andq	%r15, %rcx
+	movdqu	(%r12,%rcx), %xmm0
 	pmovmskb	%xmm0, %eax
 	testl	%eax, %eax
 	jne	.LBB10_46
@@ -2256,8 +2243,8 @@ entity_remove:
 	.p2align	4, 0x90
 .LBB10_45:
 	addq	%rdx, %rcx
-	andq	%r12, %rcx
-	movdqu	(%r15,%rcx), %xmm0
+	andq	%rbp, %rcx
+	movdqu	(%r12,%rcx), %xmm0
 	pmovmskb	%xmm0, %eax
 	addq	$16, %rdx
 	testl	%eax, %eax
@@ -2265,43 +2252,44 @@ entity_remove:
 .LBB10_46:
 	rep		bsfl	%eax, %eax
 	addq	%rcx, %rax
-	andq	%r12, %rax
-	cmpb	$0, (%r15,%rax)
+	andq	%rbp, %rax
+	cmpb	$0, (%r12,%rax)
 	js	.LBB10_48
-	movdqa	(%r15), %xmm0
+	movdqa	(%r12), %xmm0
 	pmovmskb	%xmm0, %eax
 	rep		bsfl	%eax, %eax
 .LBB10_48:
 	movq	8(%rsp), %rcx
 	cmpq	$0, 528(%rcx)
 	jne	.LBB10_55
-	testb	$1, (%r15,%rax)
+	testb	$1, (%r12,%rax)
 	jne	.LBB10_50
 .LBB10_55:
-	movzbl	(%r15,%rax), %ecx
+	movzbl	(%r12,%rax), %ecx
 	andl	$1, %ecx
-	movq	8(%rsp), %rdx
-	subq	%rcx, 528(%rdx)
+	movq	8(%rsp), %r15
+	subq	%rcx, 528(%r15)
 	leaq	-16(%rax), %rcx
-	andq	%r12, %rcx
-	movb	$13, (%r15,%rax)
-	movb	$13, 16(%rcx,%r15)
-	incq	536(%rdx)
+	andq	%rbp, %rcx
+	movb	$49, (%r12,%rax)
+	movb	$49, 16(%rcx,%r12)
+	incq	536(%r15)
 	negq	%rax
 	leaq	(%rax,%rax,2), %rax
-	movq	24(%rsp), %rcx
-	movq	%rcx, -24(%r15,%rax,8)
-	movq	%r13, -16(%r15,%rax,8)
-	movq	%r14, -8(%r15,%rax,8)
+	movq	16(%rsp), %rcx
+	movq	%rcx, -24(%r12,%rax,8)
+	movq	%r13, -16(%r12,%rax,8)
+	movq	%r14, -8(%r12,%rax,8)
 	jmp	.LBB10_7
-.LBB10_63:
-	movq	8(%rsp), %rax
-	leaq	656(%rax), %rdi
+.LBB10_64:
+	movq	8(%rsp), %rbx
+	leaq	656(%rbx), %rdi
 	movq	%r15, %rsi
+	movq	%r14, %rdx
 	callq	alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle
-	movq	8(%rsp), %rcx
-	movq	664(%rcx), %rax
-	movq	672(%rcx), %rcx
+	movq	%rbx, %rax
+	movq	664(%rbx), %rbx
+	movq	672(%rax), %r15
 	jmp	.LBB10_65
 .LBB10_21:
 	movq	8(%rsp), %r9
@@ -2310,7 +2298,7 @@ entity_remove:
 	cmpq	64(%r9), %r14
 	jne	.LBB10_24
 .Ltmp0:
-	movq	16(%rsp), %rdi
+	movq	32(%rsp), %rdi
 	movq	%r14, %rsi
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
 .Ltmp1:
@@ -2323,7 +2311,7 @@ entity_remove:
 	imulq	$88, %rdx, %rdi
 	movq	$1, (%rsi,%rdi)
 	movq	%r13, 16(%rsi,%rdi)
-	movq	%rbx, 8(%rsi,%rdi)
+	movq	%r15, 8(%rsi,%rdi)
 	movq	$4, 24(%rsi,%rdi)
 	movq	$4, 32(%rsi,%rdi)
 	movabsq	$-9223372036854775807, %r8
@@ -2338,7 +2326,7 @@ entity_remove:
 	incq	%rdx
 	movq	%rdx, 80(%r9)
 	movq	%rcx, %rsi
-	andq	%rbx, %rsi
+	andq	%r15, %rsi
 	movdqu	(%rax,%rsi), %xmm0
 	pmovmskb	%xmm0, %edx
 	testl	%edx, %edx
@@ -2368,14 +2356,14 @@ entity_remove:
 	testb	$1, (%rax,%rdx)
 	je	.LBB10_37
 .Ltmp2:
-	movq	32(%rsp), %rdi
+	movq	24(%rsp), %rdi
 	callq	hashbrown::raw::inner::RawTable<T,A>::reserve_rehash
 .Ltmp3:
 	movq	8(%rsp), %rcx
 	movq	88(%rcx), %rax
 	movq	96(%rcx), %rcx
 	movq	%rcx, %rsi
-	andq	%rbx, %rsi
+	andq	%r15, %rsi
 	movdqu	(%rax,%rsi), %xmm0
 	pmovmskb	%xmm0, %edx
 	testl	%edx, %edx
@@ -2405,131 +2393,134 @@ entity_remove:
 	subq	%rsi, 104(%rdi)
 	leaq	-16(%rdx), %rsi
 	andq	%rcx, %rsi
-	movb	$13, (%rax,%rdx)
-	movb	$13, 16(%rsi,%rax)
+	movb	$49, (%rax,%rdx)
+	movb	$49, 16(%rsi,%rax)
 	incq	112(%rdi)
 	negq	%rdx
 	leaq	(%rdx,%rdx,2), %rcx
-	movq	24(%rsp), %rdx
+	movq	16(%rsp), %rdx
 	movq	%rdx, -24(%rax,%rcx,8)
 	movq	%r13, -16(%rax,%rcx,8)
 	movq	%r14, -8(%rax,%rcx,8)
-	movq	112(%rsp), %rsi
-	cmpq	96(%rsp), %rsi
+	movq	120(%rsp), %rsi
+	cmpq	104(%rsp), %rsi
 	je	.LBB10_38
 	jmp	.LBB10_40
 .LBB10_50:
-	movq	8(%rsp), %r12
-	leaq	512(%r12), %rdi
+	movq	8(%rsp), %rbp
+	leaq	512(%rbp), %rdi
 	callq	hashbrown::raw::inner::RawTable<T,A>::reserve_rehash
-	movq	512(%r12), %r15
-	movq	520(%r12), %r12
-	andq	%r12, %rbx
-	movdqu	(%r15,%rbx), %xmm0
+	movq	512(%rbp), %r12
+	movq	520(%rbp), %rbp
+	andq	%rbp, %r15
+	movdqu	(%r12,%r15), %xmm0
 	pmovmskb	%xmm0, %eax
 	testl	%eax, %eax
 	jne	.LBB10_53
 	movl	$16, %ecx
 .LBB10_52:
-	addq	%rcx, %rbx
-	andq	%r12, %rbx
-	movdqu	(%r15,%rbx), %xmm0
+	addq	%rcx, %r15
+	andq	%rbp, %r15
+	movdqu	(%r12,%r15), %xmm0
 	pmovmskb	%xmm0, %eax
 	addq	$16, %rcx
 	testl	%eax, %eax
 	je	.LBB10_52
 .LBB10_53:
 	rep		bsfl	%eax, %eax
-	addq	%rbx, %rax
-	andq	%r12, %rax
-	cmpb	$0, (%r15,%rax)
+	addq	%r15, %rax
+	andq	%rbp, %rax
+	cmpb	$0, (%r12,%rax)
 	js	.LBB10_55
-	movdqa	(%r15), %xmm0
+	movdqa	(%r12), %xmm0
 	pmovmskb	%xmm0, %eax
 	rep		bsfl	%eax, %eax
 	jmp	.LBB10_55
-.LBB10_135:
+.LBB10_133:
 	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.8(%rip), %rdx
 	movq	%rax, %rdi
-	movq	%r14, %rsi
+	movq	%rbx, %rsi
 	callq	*core::panicking::panic_bounds_check@GOTPCREL(%rip)
-.LBB10_128:
-	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.20(%rip), %rdx
-	movq	%r14, %rdi
+.LBB10_126:
+	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.21(%rip), %rdx
+	movq	%rbp, %rdi
 	movq	%r15, %rsi
 	callq	*core::panicking::panic_bounds_check@GOTPCREL(%rip)
-.LBB10_134:
-	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.27(%rip), %rdx
-	movq	%r12, %rdi
+.LBB10_132:
+	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.28(%rip), %rdx
 	movq	%rcx, %rsi
 	callq	*core::panicking::panic_bounds_check@GOTPCREL(%rip)
-.LBB10_129:
+.LBB10_127:
 	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.14(%rip), %rdx
 	callq	*core::panicking::panic_bounds_check@GOTPCREL(%rip)
-.LBB10_138:
+.LBB10_136:
 	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.10(%rip), %rdx
 	movq	%rax, %rdi
 	callq	*core::panicking::panic_bounds_check@GOTPCREL(%rip)
-.LBB10_139:
+.LBB10_137:
 	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.12(%rip), %rdx
 	callq	*core::panicking::panic_bounds_check@GOTPCREL(%rip)
-.LBB10_117:
-	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.26(%rip), %rdx
+.LBB10_114:
+	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.27(%rip), %rdx
 	xorl	%edi, %edi
 	xorl	%esi, %esi
 	callq	*core::panicking::panic_bounds_check@GOTPCREL(%rip)
-.LBB10_114:
-	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.23(%rip), %rdx
+.LBB10_111:
+	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.24(%rip), %rdx
 	movq	%rax, %rsi
 	callq	*core::panicking::panic_bounds_check@GOTPCREL(%rip)
-.LBB10_115:
-	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.24(%rip), %rdx
+.LBB10_112:
+	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.25(%rip), %rdx
 	xorl	%edi, %edi
 	xorl	%esi, %esi
 	callq	*core::panicking::panic_bounds_check@GOTPCREL(%rip)
-.LBB10_127:
+.LBB10_124:
 	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.6(%rip), %rdi
 	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.13(%rip), %rdx
 	movl	$43, %esi
 	callq	*core::panicking::panic@GOTPCREL(%rip)
-.LBB10_133:
+.LBB10_131:
 	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.3(%rip), %rdx
-	movq	%r12, %rdi
 	movq	%rcx, %rsi
 	callq	*alloc::vec::Vec<T,A>::swap_remove::assert_failed@GOTPCREL(%rip)
-.LBB10_140:
+.LBB10_138:
 	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.6(%rip), %rdi
 	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.7(%rip), %rdx
 	movl	$43, %esi
 	callq	*core::panicking::panic@GOTPCREL(%rip)
-.LBB10_110:
+.LBB10_107:
 	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.6(%rip), %rdi
 	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.9(%rip), %rdx
 	movl	$43, %esi
 	callq	*core::panicking::panic@GOTPCREL(%rip)
-.LBB10_130:
+.LBB10_128:
 	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.6(%rip), %rdi
 	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.15(%rip), %rdx
 	movl	$43, %esi
 	callq	*core::panicking::panic@GOTPCREL(%rip)
-.LBB10_84:
+.LBB10_125:
+	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.6(%rip), %rdi
+	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.20(%rip), %rdx
+	movl	$43, %esi
+	callq	*core::panicking::panic@GOTPCREL(%rip)
+.LBB10_81:
 	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.6(%rip), %rdi
 	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.16(%rip), %rdx
 	movl	$43, %esi
 	callq	*core::panicking::panic@GOTPCREL(%rip)
-.LBB10_131:
+.LBB10_129:
 	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.6(%rip), %rdi
 	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.17(%rip), %rdx
 	movl	$43, %esi
 	callq	*core::panicking::panic@GOTPCREL(%rip)
-.LBB10_137:
+.LBB10_135:
 	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.1(%rip), %rdi
-	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.25(%rip), %rdx
+	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.26(%rip), %rdx
 	movl	$35, %esi
 	callq	*core::panicking::panic@GOTPCREL(%rip)
-.LBB10_136:
+.LBB10_134:
 	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.1(%rip), %rdi
-	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.22(%rip), %rdx
+	leaq	.Lanon.ddd9cd1641521d33379e20f985469fcb.23(%rip), %rdx
 	movl	$35, %esi
 	callq	*core::panicking::panic@GOTPCREL(%rip)
 .LBB10_56:
@@ -2544,7 +2535,7 @@ entity_remove:
 .LBB10_60:
 .Ltmp6:
 	movq	%rax, %rbx
-	movq	96(%rsp), %rsi
+	movq	104(%rsp), %rsi
 	testq	%rsi, %rsi
 	je	.LBB10_59
 .LBB10_58:
@@ -2628,7 +2619,7 @@ GCC_except_table10:
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.4,@object
 	.section	.rodata..Lanon.ddd9cd1641521d33379e20f985469fcb.4,"a",@progbits
 .Lanon.ddd9cd1641521d33379e20f985469fcb.4:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/2701188/crates/bevy_ecs/src/world/entity_ref.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-11a63d9ba653d13e/56a7685/crates/bevy_ecs/src/world/entity_ref.rs"
 	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.4, 102
 
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.5,@object
@@ -2680,7 +2671,7 @@ GCC_except_table10:
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.11,@object
 	.section	.rodata..Lanon.ddd9cd1641521d33379e20f985469fcb.11,"a",@progbits
 .Lanon.ddd9cd1641521d33379e20f985469fcb.11:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/2701188/crates/bevy_ecs/src/archetype.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-11a63d9ba653d13e/56a7685/crates/bevy_ecs/src/archetype.rs"
 	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.11, 95
 
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.12,@object
@@ -2740,7 +2731,7 @@ GCC_except_table10:
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.19,@object
 	.section	.rodata..Lanon.ddd9cd1641521d33379e20f985469fcb.19,"a",@progbits
 .Lanon.ddd9cd1641521d33379e20f985469fcb.19:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/2701188/crates/bevy_ecs/src/storage/sparse_set.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-11a63d9ba653d13e/56a7685/crates/bevy_ecs/src/storage/sparse_set.rs"
 	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.19, 104
 
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.20,@object
@@ -2748,90 +2739,98 @@ GCC_except_table10:
 	.p2align	3, 0x0
 .Lanon.ddd9cd1641521d33379e20f985469fcb.20:
 	.quad	.Lanon.ddd9cd1641521d33379e20f985469fcb.19
-	.asciz	"h\000\000\000\000\000\000\000L\000\000\000\024\000\000"
+	.asciz	"h\000\000\000\000\000\000\000\334\001\000\000M\000\000"
 	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.20, 24
 
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.21,@object
-	.section	.rodata..Lanon.ddd9cd1641521d33379e20f985469fcb.21,"a",@progbits
+	.section	.data.rel.ro..Lanon.ddd9cd1641521d33379e20f985469fcb.21,"aw",@progbits
+	.p2align	3, 0x0
 .Lanon.ddd9cd1641521d33379e20f985469fcb.21:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/2701188/crates/bevy_ecs/src/storage/table.rs"
-	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.21, 99
+	.quad	.Lanon.ddd9cd1641521d33379e20f985469fcb.19
+	.asciz	"h\000\000\000\000\000\000\000M\000\000\000\024\000\000"
+	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.21, 24
 
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.22,@object
-	.section	.data.rel.ro..Lanon.ddd9cd1641521d33379e20f985469fcb.22,"aw",@progbits
-	.p2align	3, 0x0
+	.section	.rodata..Lanon.ddd9cd1641521d33379e20f985469fcb.22,"a",@progbits
 .Lanon.ddd9cd1641521d33379e20f985469fcb.22:
-	.quad	.Lanon.ddd9cd1641521d33379e20f985469fcb.21
-	.asciz	"c\000\000\000\000\000\000\000Q\003\000\0002\000\000"
-	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.22, 24
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-11a63d9ba653d13e/56a7685/crates/bevy_ecs/src/storage/table.rs"
+	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.22, 99
 
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.23,@object
 	.section	.data.rel.ro..Lanon.ddd9cd1641521d33379e20f985469fcb.23,"aw",@progbits
 	.p2align	3, 0x0
 .Lanon.ddd9cd1641521d33379e20f985469fcb.23:
-	.quad	.Lanon.ddd9cd1641521d33379e20f985469fcb.21
-	.asciz	"c\000\000\000\000\000\000\000R\003\000\000\023\000\000"
+	.quad	.Lanon.ddd9cd1641521d33379e20f985469fcb.22
+	.asciz	"c\000\000\000\000\000\000\000Q\003\000\0002\000\000"
 	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.23, 24
 
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.24,@object
 	.section	.data.rel.ro..Lanon.ddd9cd1641521d33379e20f985469fcb.24,"aw",@progbits
 	.p2align	3, 0x0
 .Lanon.ddd9cd1641521d33379e20f985469fcb.24:
-	.quad	.Lanon.ddd9cd1641521d33379e20f985469fcb.21
-	.asciz	"c\000\000\000\000\000\000\000R\003\000\000/\000\000"
+	.quad	.Lanon.ddd9cd1641521d33379e20f985469fcb.22
+	.asciz	"c\000\000\000\000\000\000\000R\003\000\000\023\000\000"
 	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.24, 24
 
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.25,@object
 	.section	.data.rel.ro..Lanon.ddd9cd1641521d33379e20f985469fcb.25,"aw",@progbits
 	.p2align	3, 0x0
 .Lanon.ddd9cd1641521d33379e20f985469fcb.25:
-	.quad	.Lanon.ddd9cd1641521d33379e20f985469fcb.21
-	.asciz	"c\000\000\000\000\000\000\000N\003\000\0002\000\000"
+	.quad	.Lanon.ddd9cd1641521d33379e20f985469fcb.22
+	.asciz	"c\000\000\000\000\000\000\000R\003\000\000/\000\000"
 	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.25, 24
 
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.26,@object
 	.section	.data.rel.ro..Lanon.ddd9cd1641521d33379e20f985469fcb.26,"aw",@progbits
 	.p2align	3, 0x0
 .Lanon.ddd9cd1641521d33379e20f985469fcb.26:
-	.quad	.Lanon.ddd9cd1641521d33379e20f985469fcb.21
-	.asciz	"c\000\000\000\000\000\000\000O\003\000\000\023\000\000"
+	.quad	.Lanon.ddd9cd1641521d33379e20f985469fcb.22
+	.asciz	"c\000\000\000\000\000\000\000N\003\000\0002\000\000"
 	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.26, 24
 
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.27,@object
 	.section	.data.rel.ro..Lanon.ddd9cd1641521d33379e20f985469fcb.27,"aw",@progbits
 	.p2align	3, 0x0
 .Lanon.ddd9cd1641521d33379e20f985469fcb.27:
-	.quad	.Lanon.ddd9cd1641521d33379e20f985469fcb.11
-	.asciz	"_\000\000\000\000\000\000\000\350\001\000\000#\000\000"
+	.quad	.Lanon.ddd9cd1641521d33379e20f985469fcb.22
+	.asciz	"c\000\000\000\000\000\000\000O\003\000\000\023\000\000"
 	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.27, 24
 
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.28,@object
-	.section	.rodata..Lanon.ddd9cd1641521d33379e20f985469fcb.28,"a",@progbits
+	.section	.data.rel.ro..Lanon.ddd9cd1641521d33379e20f985469fcb.28,"aw",@progbits
+	.p2align	3, 0x0
 .Lanon.ddd9cd1641521d33379e20f985469fcb.28:
-	.ascii	"Hash table capacity overflow"
-	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.28, 28
+	.quad	.Lanon.ddd9cd1641521d33379e20f985469fcb.11
+	.asciz	"_\000\000\000\000\000\000\000\350\001\000\000#\000\000"
+	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.28, 24
 
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.29,@object
-	.section	.data.rel.ro..Lanon.ddd9cd1641521d33379e20f985469fcb.29,"aw",@progbits
-	.p2align	3, 0x0
+	.section	.rodata..Lanon.ddd9cd1641521d33379e20f985469fcb.29,"a",@progbits
 .Lanon.ddd9cd1641521d33379e20f985469fcb.29:
-	.quad	.Lanon.ddd9cd1641521d33379e20f985469fcb.28
-	.asciz	"\034\000\000\000\000\000\000"
-	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.29, 16
+	.ascii	"Hash table capacity overflow"
+	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.29, 28
 
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.30,@object
-	.section	.rodata..Lanon.ddd9cd1641521d33379e20f985469fcb.30,"a",@progbits
+	.section	.data.rel.ro..Lanon.ddd9cd1641521d33379e20f985469fcb.30,"aw",@progbits
+	.p2align	3, 0x0
 .Lanon.ddd9cd1641521d33379e20f985469fcb.30:
-	.ascii	"/home/james/.cargo/registry/src/index.crates.io-6f17d22bba15001f/hashbrown-0.14.3/src/raw/mod.rs"
-	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.30, 96
+	.quad	.Lanon.ddd9cd1641521d33379e20f985469fcb.29
+	.asciz	"\034\000\000\000\000\000\000"
+	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.30, 16
 
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.31,@object
-	.section	.data.rel.ro..Lanon.ddd9cd1641521d33379e20f985469fcb.31,"aw",@progbits
-	.p2align	3, 0x0
+	.section	.rodata..Lanon.ddd9cd1641521d33379e20f985469fcb.31,"a",@progbits
 .Lanon.ddd9cd1641521d33379e20f985469fcb.31:
-	.quad	.Lanon.ddd9cd1641521d33379e20f985469fcb.30
+	.ascii	"/home/james/.cargo/registry/src/index.crates.io-6f17d22bba15001f/hashbrown-0.14.3/src/raw/mod.rs"
+	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.31, 96
+
+	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.32,@object
+	.section	.data.rel.ro..Lanon.ddd9cd1641521d33379e20f985469fcb.32,"aw",@progbits
+	.p2align	3, 0x0
+.Lanon.ddd9cd1641521d33379e20f985469fcb.32:
+	.quad	.Lanon.ddd9cd1641521d33379e20f985469fcb.31
 	.asciz	"`\000\000\000\000\000\000\000V\000\000\000(\000\000"
-	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.31, 24
+	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.32, 24
 
 	.hidden	DW.ref.rust_eh_personality
 	.weak	DW.ref.rust_eh_personality
diff --git a/results/event_reader.s b/results/event_reader.s
index d75630d..da72884 100644
--- a/results/event_reader.s
+++ b/results/event_reader.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"event_reader.b8c05d6a004da9ba-cgu.0"
+	.file	"event_reader.dffae5f6d0e45432-cgu.0"
 	.section	.text.event_reader,"ax",@progbits
 	.globl	event_reader
 	.p2align	4, 0x90
diff --git a/results/event_writer.s b/results/event_writer.s
index eac5496..a5829e2 100644
--- a/results/event_writer.s
+++ b/results/event_writer.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"event_writer.d9bf33d23478696f-cgu.0"
+	.file	"event_writer.4844e9d12c74b0cd-cgu.0"
 	.section	.text.alloc::raw_vec::finish_grow,"ax",@progbits
 	.p2align	4, 0x90
 	.type	alloc::raw_vec::finish_grow,@function
diff --git a/results/query_for_each.s b/results/query_for_each.s
index 3e5b8ff..94288b2 100644
--- a/results/query_for_each.s
+++ b/results/query_for_each.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"query_for_each.94a4e24cda9c27ee-cgu.0"
+	.file	"query_for_each.5205ec31e9e7494b-cgu.0"
 	.section	.text.query_for_each,"ax",@progbits
 	.globl	query_for_each
 	.p2align	4, 0x90
@@ -49,14 +49,14 @@ query_for_each:
 	movq	400(%rax), %rbx
 	movq	24(%r10), %r14
 	movq	56(%r10), %r15
-	shlq	$4, %r11
-	movq	8(%r15,%r11), %r10
+	movq	(%r15,%r11,8), %r10
+	notq	%r10
 	leaq	(%r10,%r10,2), %r11
 	shlq	$5, %r11
 	movq	16(%r14,%r11), %r10
 	movq	80(%r14,%r11), %r11
-	shlq	$4, %rbx
-	movq	8(%r15,%rbx), %rbx
+	movq	(%r15,%rbx,8), %rbx
+	notq	%rbx
 	leaq	(%rbx,%rbx,2), %rbx
 	shlq	$5, %rbx
 	movq	16(%r14,%rbx), %rbx
@@ -121,7 +121,7 @@ query_for_each:
 	.type	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.3,@object
 	.section	.rodata..Lanon.0d252a227dcf2249288cd9db6e2d5b21.3,"a",@progbits
 .Lanon.0d252a227dcf2249288cd9db6e2d5b21.3:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/2701188/crates/bevy_ecs/src/query/iter.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-11a63d9ba653d13e/56a7685/crates/bevy_ecs/src/query/iter.rs"
 	.size	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.3, 96
 
 	.type	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.4,@object
diff --git a/results/query_for_each_sparse.s b/results/query_for_each_sparse.s
index a1a579f..f6bf5d8 100644
--- a/results/query_for_each_sparse.s
+++ b/results/query_for_each_sparse.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"query_for_each_sparse.1bfe6f2e58bb8548-cgu.0"
+	.file	"query_for_each_sparse.ba7d758d2c538977-cgu.0"
 	.section	.text.query_for_each,"ax",@progbits
 	.globl	query_for_each
 	.p2align	4, 0x90
@@ -17,10 +17,10 @@ query_for_each:
 	jbe	.LBB0_5
 	testq	%r9, %r9
 	je	.LBB0_5
-	shlq	$4, %rdx
-	cmpq	$0, (%r9,%rdx)
+	movq	(%r9,%rdx,8), %rcx
+	testq	%rcx, %rcx
 	je	.LBB0_3
-	movq	8(%r9,%rdx), %rcx
+	notq	%rcx
 	leaq	(%rcx,%rcx,8), %rcx
 	shlq	$4, %rcx
 	addq	224(%rax), %rcx
@@ -31,10 +31,10 @@ query_for_each:
 .LBB0_6:
 	testq	%r9, %r9
 	je	.LBB0_10
-	shlq	$4, %r8
-	cmpq	$0, (%r9,%r8)
+	movq	(%r9,%r8,8), %rdx
+	testq	%rdx, %rdx
 	je	.LBB0_8
-	movq	8(%r9,%r8), %rdx
+	notq	%rdx
 	leaq	(%rdx,%rdx,8), %rdx
 	shlq	$4, %rdx
 	addq	224(%rax), %rdx
diff --git a/results/query_get.s b/results/query_get.s
index af86a94..c57cdf8 100644
--- a/results/query_get.s
+++ b/results/query_get.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"query_get.78aa81406b1f0c37-cgu.0"
+	.file	"query_get.ef1acac8902adec3-cgu.0"
 	.section	.text.query_get,"ax",@progbits
 	.globl	query_get
 	.p2align	4, 0x90
@@ -57,12 +57,12 @@ query_get:
 	movq	400(%r9), %rsi
 	movq	24(%r10), %rdi
 	movq	56(%r10), %r9
-	shlq	$4, %rdx
-	movq	8(%r9,%rdx), %rdx
+	movq	(%r9,%rdx,8), %rdx
+	notq	%rdx
 	leaq	(%rdx,%rdx,2), %rdx
 	shlq	$5, %rdx
-	shlq	$4, %rsi
-	movq	8(%r9,%rsi), %rsi
+	movq	(%r9,%rsi,8), %rsi
+	notq	%rsi
 	leaq	(%rsi,%rsi,2), %rsi
 	shlq	$5, %rsi
 	shlq	$2, %r8
diff --git a/results/query_get_sparse.s b/results/query_get_sparse.s
index 0e721e6..5723801 100644
--- a/results/query_get_sparse.s
+++ b/results/query_get_sparse.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"query_get_sparse.1a8e5aef354730ea-cgu.0"
+	.file	"query_get_sparse.fb23eebebb7ab50f-cgu.0"
 	.section	.text.query_get,"ax",@progbits
 	.globl	query_get
 	.p2align	4, 0x90
@@ -46,10 +46,10 @@ query_get:
 	jbe	.LBB0_16
 	testq	%r10, %r10
 	je	.LBB0_16
-	shlq	$4, %rsi
-	cmpq	$0, (%r10,%rsi)
+	movq	(%r10,%rsi,8), %rsi
+	testq	%rsi, %rsi
 	je	.LBB0_15
-	movq	8(%r10,%rsi), %rsi
+	notq	%rsi
 	leaq	(%rsi,%rsi,8), %r9
 	shlq	$4, %r9
 	addq	224(%r8), %r9
@@ -88,10 +88,10 @@ query_get:
 	jbe	.LBB0_21
 	testq	%r10, %r10
 	je	.LBB0_21
-	shlq	$4, %rdi
-	cmpq	$0, (%r10,%rdi)
+	movq	(%r10,%rdi,8), %rsi
+	testq	%rsi, %rsi
 	je	.LBB0_20
-	movq	8(%r10,%rdi), %rsi
+	notq	%rsi
 	leaq	(%rsi,%rsi,8), %rsi
 	shlq	$4, %rsi
 	addq	224(%r8), %rsi
diff --git a/results/query_iter.s b/results/query_iter.s
index f111c31..51746c9 100644
--- a/results/query_iter.s
+++ b/results/query_iter.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"query_iter.8befdc756cef0089-cgu.0"
+	.file	"query_iter.73e9b3e3a7b95be9-cgu.0"
 	.section	.text.query_iter,"ax",@progbits
 	.globl	query_iter
 	.p2align	4, 0x90
@@ -47,10 +47,10 @@ query_iter:
 	testq	%r9, %r9
 	je	.LBB0_3
 	movq	56(%r15), %rbx
-	shlq	$4, %r11
-	movq	8(%rbx,%r11), %r11
-	shlq	$4, %r10
-	movq	8(%rbx,%r10), %rbx
+	movq	(%rbx,%r11,8), %r11
+	notq	%r11
+	movq	(%rbx,%r10,8), %rbx
+	notq	%rbx
 	movq	24(%r15), %r14
 	leaq	(%r11,%r11,2), %r11
 	shlq	$5, %r11
@@ -104,7 +104,7 @@ query_iter:
 	.type	.Lanon.a01df851b6197f632189e2f0fa818bdd.1,@object
 	.section	.rodata..Lanon.a01df851b6197f632189e2f0fa818bdd.1,"a",@progbits
 .Lanon.a01df851b6197f632189e2f0fa818bdd.1:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/2701188/crates/bevy_ecs/src/storage/table.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-11a63d9ba653d13e/56a7685/crates/bevy_ecs/src/storage/table.rs"
 	.size	.Lanon.a01df851b6197f632189e2f0fa818bdd.1, 99
 
 	.type	.Lanon.a01df851b6197f632189e2f0fa818bdd.2,@object
diff --git a/results/query_iter_sparse.s b/results/query_iter_sparse.s
index 6357f53..f1760ce 100644
--- a/results/query_iter_sparse.s
+++ b/results/query_iter_sparse.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"query_iter_sparse.37eddd5afdc18781-cgu.0"
+	.file	"query_iter_sparse.38f6db9e7c89b606-cgu.0"
 	.section	.text.query_iter,"ax",@progbits
 	.globl	query_iter
 	.p2align	4, 0x90
@@ -17,10 +17,10 @@ query_iter:
 	jbe	.LBB0_4
 	testq	%r9, %r9
 	je	.LBB0_4
-	shlq	$4, %rdx
-	cmpq	$0, (%r9,%rdx)
+	movq	(%r9,%rdx,8), %rcx
+	testq	%rcx, %rcx
 	je	.LBB0_8
-	movq	8(%r9,%rdx), %rcx
+	notq	%rcx
 	leaq	(%rcx,%rcx,8), %rcx
 	shlq	$4, %rcx
 	addq	224(%rax), %rcx
@@ -31,10 +31,10 @@ query_iter:
 .LBB0_5:
 	testq	%r9, %r9
 	je	.LBB0_10
-	shlq	$4, %rsi
-	cmpq	$0, (%r9,%rsi)
+	movq	(%r9,%rsi,8), %rdx
+	testq	%rdx, %rdx
 	je	.LBB0_9
-	movq	8(%r9,%rsi), %rdx
+	notq	%rdx
 	leaq	(%rdx,%rdx,8), %rdx
 	shlq	$4, %rdx
 	addq	224(%rax), %rdx
diff --git a/results/query_state_for_each.s b/results/query_state_for_each.s
index 09b12f7..897a2e6 100644
--- a/results/query_state_for_each.s
+++ b/results/query_state_for_each.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"query_state_for_each.3dd673afa6bec368-cgu.0"
+	.file	"query_state_for_each.bec4527b39694a62-cgu.0"
 	.section	.text.alloc::raw_vec::finish_grow,"ax",@progbits
 	.p2align	4, 0x90
 	.type	alloc::raw_vec::finish_grow,@function
@@ -303,14 +303,14 @@ query_state_for_each:
 	movq	400(%r13), %rbx
 	movq	24(%r10), %r14
 	movq	56(%r10), %r15
-	shlq	$4, %r11
-	movq	8(%r15,%r11), %r10
+	movq	(%r15,%r11,8), %r10
+	notq	%r10
 	leaq	(%r10,%r10,2), %r11
 	shlq	$5, %r11
 	movq	16(%r14,%r11), %r10
 	movq	80(%r14,%r11), %r11
-	shlq	$4, %rbx
-	movq	8(%r15,%rbx), %rbx
+	movq	(%r15,%rbx,8), %rbx
+	notq	%rbx
 	leaq	(%rbx,%rbx,2), %rbx
 	shlq	$5, %rbx
 	movq	16(%r14,%rbx), %rbx
@@ -357,7 +357,7 @@ query_state_for_each:
 	leaq	80(%r13), %rax
 	movq	%rax, 160(%rsp)
 	leaq	104(%r13), %rax
-	movq	%rax, 104(%rsp)
+	movq	%rax, 96(%rsp)
 	leaq	112(%r13), %rax
 	movq	%rax, 240(%rsp)
 	leaq	136(%r13), %rax
@@ -395,14 +395,12 @@ query_state_for_each:
 	movq	128(%rbp), %r15
 	testq	%r15, %r15
 	je	.LBB3_76
-	shlq	$4, %rax
-	cmpq	$0, (%r15,%rax)
+	cmpq	$0, (%r15,%rax,8)
 	je	.LBB3_76
 	movq	400(%r13), %rax
 	cmpq	%rax, %rbx
 	jbe	.LBB3_76
-	shlq	$4, %rax
-	cmpq	$0, (%r15,%rax)
+	cmpq	$0, (%r15,%rax,8)
 	je	.LBB3_76
 	movq	336(%r13), %rax
 	testq	%rax, %rax
@@ -453,8 +451,7 @@ query_state_for_each:
 	jbe	.LBB3_31
 	leal	-1(%r8), %r11d
 	andl	%r8d, %r11d
-	shlq	$4, %r10
-	cmpq	$0, (%r15,%r10)
+	cmpq	$0, (%r15,%r10,8)
 	movl	%r11d, %r8d
 	jne	.LBB3_16
 	jmp	.LBB3_31
@@ -500,8 +497,7 @@ query_state_for_each:
 	orq	%r10, %r9
 	cmpq	%r9, %rbx
 	jbe	.LBB3_26
-	shlq	$4, %r9
-	cmpq	$0, (%r15,%r9)
+	cmpq	$0, (%r15,%r9,8)
 	je	.LBB3_26
 	.p2align	4, 0x90
 .LBB3_31:
@@ -509,7 +505,7 @@ query_state_for_each:
 	jne	.LBB3_11
 	jmp	.LBB3_76
 .LBB3_32:
-	movq	%r15, 96(%rsp)
+	movq	%r15, 104(%rsp)
 	movq	%rbx, 112(%rsp)
 	leaq	16(%rsp), %rdi
 	movq	232(%rsp), %rsi
@@ -557,12 +553,11 @@ query_state_for_each:
 	orq	%rcx, %rax
 	cmpq	%rax, 112(%rsp)
 	jbe	.LBB3_33
-	shlq	$4, %rax
-	movq	96(%rsp), %rcx
-	cmpq	$0, (%rcx,%rax)
+	movq	104(%rsp), %rcx
+	movq	(%rcx,%rax,8), %rax
+	testq	%rax, %rax
 	je	.LBB3_33
-	movq	96(%rsp), %rcx
-	movq	8(%rcx,%rax), %rax
+	notq	%rax
 	shlq	$4, %rax
 	movq	168(%rsp), %rcx
 	movq	(%rcx,%rax), %rax
@@ -572,7 +567,7 @@ query_state_for_each:
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
 	movq	120(%rsp), %rcx
 	movq	%rcx, 8(%rsp)
-	movq	104(%rsp), %rax
+	movq	96(%rsp), %rax
 	cmpq	%rcx, (%rax)
 	jbe	.LBB3_42
 	movl	$1, %eax
@@ -592,7 +587,7 @@ query_state_for_each:
 	testq	%rcx, %rcx
 	movq	fixedbitset::FixedBitSet::grow@GOTPCREL(%rip), %r12
 	movq	112(%rsp), %rdx
-	movq	96(%rsp), %rsi
+	movq	104(%rsp), %rsi
 	je	.LBB3_49
 	decq	%rax
 	movl	(%rcx), %ebx
@@ -605,7 +600,7 @@ query_state_for_each:
 	xorl	%ebp, %ebp
 	movq	fixedbitset::FixedBitSet::grow@GOTPCREL(%rip), %r12
 	movq	112(%rsp), %rdx
-	movq	96(%rsp), %rsi
+	movq	104(%rsp), %rsi
 .LBB3_49:
 	xorl	%r13d, %r13d
 	.p2align	4, 0x90
@@ -628,10 +623,10 @@ query_state_for_each:
 	orq	%rcx, %rax
 	cmpq	%rax, %rdx
 	jbe	.LBB3_50
-	shlq	$4, %rax
-	cmpq	$0, (%rsi,%rax)
+	movq	(%rsi,%rax,8), %rax
+	testq	%rax, %rax
 	je	.LBB3_50
-	movq	8(%rsi,%rax), %rax
+	notq	%rax
 	shlq	$4, %rax
 	movq	168(%rsp), %rcx
 	movq	(%rcx,%rax), %r15
@@ -640,7 +635,7 @@ query_state_for_each:
 	movq	%rsi, 120(%rsp)
 	callq	*%r12
 	movq	%r15, 8(%rsp)
-	movq	104(%rsp), %rax
+	movq	96(%rsp), %rax
 	cmpq	%r15, (%rax)
 	jbe	.LBB3_42
 	movq	%r12, %rdx
@@ -664,7 +659,7 @@ query_state_for_each:
 	orl	%r12d, (%rax,%r15,4)
 	movq	fixedbitset::FixedBitSet::grow@GOTPCREL(%rip), %r12
 	movq	112(%rsp), %rdx
-	movq	96(%rsp), %rsi
+	movq	104(%rsp), %rsi
 	jmp	.LBB3_50
 .LBB3_59:
 	movq	248(%rsp), %rbp
@@ -753,7 +748,7 @@ query_state_for_each:
 	movq	%rax, 64(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
 	movq	%rax, 72(%rsp)
-	movq	104(%rsp), %rcx
+	movq	96(%rsp), %rcx
 	jmp	.LBB3_43
 .LBB3_57:
 	leaq	8(%rsp), %rax
@@ -893,7 +888,7 @@ query_state_for_each:
 	.type	.Lanon.6dae6fee9a6576153fd5b36d700139f2.11,@object
 	.section	.rodata..Lanon.6dae6fee9a6576153fd5b36d700139f2.11,"a",@progbits
 .Lanon.6dae6fee9a6576153fd5b36d700139f2.11:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/2701188/crates/bevy_ecs/src/query/iter.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-11a63d9ba653d13e/56a7685/crates/bevy_ecs/src/query/iter.rs"
 	.size	.Lanon.6dae6fee9a6576153fd5b36d700139f2.11, 96
 
 	.type	.Lanon.6dae6fee9a6576153fd5b36d700139f2.12,@object
@@ -907,7 +902,7 @@ query_state_for_each:
 	.type	.Lanon.6dae6fee9a6576153fd5b36d700139f2.13,@object
 	.section	.rodata..Lanon.6dae6fee9a6576153fd5b36d700139f2.13,"a",@progbits
 .Lanon.6dae6fee9a6576153fd5b36d700139f2.13:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/2701188/crates/bevy_ecs/src/query/state.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-11a63d9ba653d13e/56a7685/crates/bevy_ecs/src/query/state.rs"
 	.size	.Lanon.6dae6fee9a6576153fd5b36d700139f2.13, 97
 
 	.type	.Lanon.6dae6fee9a6576153fd5b36d700139f2.14,@object
diff --git a/results/query_state_for_each_sparse.s b/results/query_state_for_each_sparse.s
index 04870f2..01ef1d5 100644
--- a/results/query_state_for_each_sparse.s
+++ b/results/query_state_for_each_sparse.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"query_state_for_each_sparse.d5c30613bc219cd3-cgu.0"
+	.file	"query_state_for_each_sparse.f21a8ccd69e3c164-cgu.0"
 	.section	.text.alloc::raw_vec::finish_grow,"ax",@progbits
 	.p2align	4, 0x90
 	.type	alloc::raw_vec::finish_grow,@function
@@ -282,10 +282,10 @@ query_for_each:
 	jbe	.LBB3_82
 	testq	%rsi, %rsi
 	je	.LBB3_82
-	shlq	$4, %rcx
-	cmpq	$0, (%rsi,%rcx)
+	movq	(%rsi,%rcx,8), %rax
+	testq	%rax, %rax
 	je	.LBB3_80
-	movq	8(%rsi,%rcx), %rax
+	notq	%rax
 	leaq	(%rax,%rax,8), %rax
 	shlq	$4, %rax
 	addq	224(%r8), %rax
@@ -296,10 +296,10 @@ query_for_each:
 .LBB3_83:
 	testq	%rsi, %rsi
 	je	.LBB3_87
-	shlq	$4, %rdx
-	cmpq	$0, (%rsi,%rdx)
+	movq	(%rsi,%rdx,8), %rcx
+	testq	%rcx, %rcx
 	je	.LBB3_85
-	movq	8(%rsi,%rdx), %rcx
+	notq	%rcx
 	leaq	(%rcx,%rcx,8), %rcx
 	shlq	$4, %rcx
 	addq	224(%r8), %rcx
@@ -314,7 +314,7 @@ query_for_each:
 	leaq	216(%r14), %rax
 	movq	%rax, 240(%rsp)
 	leaq	80(%r14), %rax
-	movq	%rax, 152(%rsp)
+	movq	%rax, 144(%rsp)
 	leaq	104(%r14), %rax
 	movq	%rax, 88(%rsp)
 	leaq	112(%r14), %rax
@@ -324,16 +324,16 @@ query_for_each:
 	leaq	48(%r14), %rax
 	movq	%rax, 208(%rsp)
 	leaq	72(%r14), %rax
-	movq	%rax, 144(%rsp)
+	movq	%rax, 136(%rsp)
 	leaq	368(%r14), %rax
 	movq	%rax, 192(%rsp)
 	leaq	16(%r14), %rax
 	movq	%rax, 200(%rsp)
 	leaq	40(%r14), %rax
-	movq	%rax, 136(%rsp)
+	movq	%rax, 128(%rsp)
 	leaq	344(%r14), %rax
 	movq	%rax, 184(%rsp)
-	movq	%r14, 128(%rsp)
+	movq	%r14, 120(%rsp)
 	movq	%rbp, 232(%rsp)
 	movq	%r13, 224(%rsp)
 	jmp	.LBB3_4
@@ -355,14 +355,12 @@ query_for_each:
 	movq	128(%r12), %r15
 	testq	%r15, %r15
 	je	.LBB3_76
-	shlq	$4, %rax
-	cmpq	$0, (%r15,%rax)
+	cmpq	$0, (%r15,%rax,8)
 	je	.LBB3_76
 	movq	400(%r14), %rax
 	cmpq	%rax, %rbx
 	jbe	.LBB3_76
-	shlq	$4, %rax
-	cmpq	$0, (%r15,%rax)
+	cmpq	$0, (%r15,%rax,8)
 	je	.LBB3_76
 	movq	336(%r14), %rax
 	testq	%rax, %rax
@@ -413,8 +411,7 @@ query_for_each:
 	jbe	.LBB3_31
 	leal	-1(%r8), %r11d
 	andl	%r8d, %r11d
-	shlq	$4, %r10
-	cmpq	$0, (%r15,%r10)
+	cmpq	$0, (%r15,%r10,8)
 	movl	%r11d, %r8d
 	jne	.LBB3_16
 	jmp	.LBB3_31
@@ -460,8 +457,7 @@ query_for_each:
 	orq	%r10, %r9
 	cmpq	%r9, %rbx
 	jbe	.LBB3_26
-	shlq	$4, %r9
-	cmpq	$0, (%r15,%r9)
+	cmpq	$0, (%r15,%r9,8)
 	je	.LBB3_26
 	.p2align	4, 0x90
 .LBB3_31:
@@ -469,7 +465,7 @@ query_for_each:
 	jne	.LBB3_11
 	jmp	.LBB3_76
 .LBB3_32:
-	movq	%r15, 96(%rsp)
+	movq	%r15, 160(%rsp)
 	movq	%rbx, 168(%rsp)
 	leaq	40(%rsp), %rdi
 	movq	248(%rsp), %rsi
@@ -481,9 +477,9 @@ query_for_each:
 	movq	56(%rsp), %rbx
 	movl	64(%rsp), %ebp
 	movq	72(%rsp), %rsi
-	movq	%rax, 120(%rsp)
+	movq	%rax, 112(%rsp)
 	movq	96(%rax), %rax
-	movq	%rax, 160(%rsp)
+	movq	%rax, 152(%rsp)
 	.p2align	4, 0x90
 .LBB3_33:
 	testl	%ebp, %ebp
@@ -517,21 +513,20 @@ query_for_each:
 	orq	%rcx, %rax
 	cmpq	%rax, 168(%rsp)
 	jbe	.LBB3_33
-	shlq	$4, %rax
-	movq	96(%rsp), %rcx
-	cmpq	$0, (%rcx,%rax)
+	movq	160(%rsp), %rcx
+	movq	(%rcx,%rax,8), %rax
+	testq	%rax, %rax
 	je	.LBB3_33
-	movq	%rsi, 104(%rsp)
-	movq	96(%rsp), %rcx
-	movq	8(%rcx,%rax), %rax
+	movq	%rsi, 96(%rsp)
+	notq	%rax
 	shlq	$4, %rax
-	movq	160(%rsp), %rcx
+	movq	152(%rsp), %rcx
 	movq	(%rcx,%rax), %rax
-	movq	%rax, 112(%rsp)
+	movq	%rax, 104(%rsp)
 	leaq	1(%rax), %rsi
-	movq	152(%rsp), %rdi
+	movq	144(%rsp), %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-	movq	112(%rsp), %rcx
+	movq	104(%rsp), %rcx
 	movq	%rcx, (%rsp)
 	movq	88(%rsp), %rax
 	cmpq	%rcx, (%rax)
@@ -541,7 +536,7 @@ query_for_each:
 	movq	88(%r14), %rdx
 	shrq	$5, %rcx
 	orl	%eax, (%rdx,%rcx,4)
-	movq	104(%rsp), %rsi
+	movq	96(%rsp), %rsi
 	jmp	.LBB3_33
 .LBB3_45:
 	movq	232(%r14), %rax
@@ -552,7 +547,7 @@ query_for_each:
 	leaq	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.5(%rip), %rbx
 	movl	$0, %ebp
 	testq	%rcx, %rcx
-	movq	120(%rsp), %r12
+	movq	112(%rsp), %r12
 	movq	fixedbitset::FixedBitSet::grow@GOTPCREL(%rip), %r15
 	je	.LBB3_49
 	decq	%rax
@@ -564,7 +559,7 @@ query_for_each:
 .LBB3_46:
 	leaq	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.5(%rip), %rbx
 	xorl	%ebp, %ebp
-	movq	120(%rsp), %r12
+	movq	112(%rsp), %r12
 	movq	fixedbitset::FixedBitSet::grow@GOTPCREL(%rip), %r15
 .LBB3_49:
 	xorl	%r14d, %r14d
@@ -588,18 +583,17 @@ query_for_each:
 	orq	%rcx, %rax
 	cmpq	%rax, 168(%rsp)
 	jbe	.LBB3_50
-	shlq	$4, %rax
-	movq	96(%rsp), %rcx
-	cmpq	$0, (%rcx,%rax)
+	movq	160(%rsp), %rcx
+	movq	(%rcx,%rax,8), %rax
+	testq	%rax, %rax
 	je	.LBB3_50
-	movq	96(%rsp), %rcx
-	movq	8(%rcx,%rax), %rax
+	notq	%rax
 	shlq	$4, %rax
-	movq	160(%rsp), %rcx
+	movq	152(%rsp), %rcx
 	movq	(%rcx,%rax), %r12
 	leaq	1(%r12), %rsi
-	movq	152(%rsp), %rdi
-	movq	%rsi, 112(%rsp)
+	movq	144(%rsp), %rdi
+	movq	%rsi, 104(%rsp)
 	callq	*%r15
 	movq	%r12, (%rsp)
 	movq	88(%rsp), %rax
@@ -609,30 +603,30 @@ query_for_each:
 	movq	%r12, %r15
 	shrq	$5, %r15
 	movq	%r12, %rcx
-	movq	%r12, 104(%rsp)
+	movq	%r12, 96(%rsp)
 	movl	$1, %r12d
 	shll	%cl, %r12d
-	movq	128(%rsp), %rax
+	movq	120(%rsp), %rax
 	movq	88(%rax), %rax
 	orl	%r12d, (%rax,%r15,4)
 	movq	256(%rsp), %rdi
-	movq	112(%rsp), %rsi
+	movq	104(%rsp), %rsi
 	callq	*%rdx
-	movq	128(%rsp), %rax
-	movq	104(%rsp), %rcx
+	movq	120(%rsp), %rax
+	movq	96(%rsp), %rcx
 	movq	%rcx, (%rsp)
 	cmpq	%rcx, 136(%rax)
 	jbe	.LBB3_57
 	movq	120(%rax), %rax
 	orl	%r12d, (%rax,%r15,4)
-	movq	120(%rsp), %r12
+	movq	112(%rsp), %r12
 	movq	fixedbitset::FixedBitSet::grow@GOTPCREL(%rip), %r15
 	jmp	.LBB3_50
 .LBB3_59:
 	movl	144(%r12), %r15d
 	movl	%r15d, %ebx
 	shrl	$5, %ebx
-	movq	128(%rsp), %r14
+	movq	120(%rsp), %r14
 	cmpq	64(%r14), %rbx
 	movq	232(%rsp), %rbp
 	movq	224(%rsp), %r13
@@ -648,7 +642,7 @@ query_for_each:
 	movq	208(%rsp), %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
 	movq	%r15, (%rsp)
-	movq	144(%rsp), %rax
+	movq	136(%rsp), %rax
 	cmpq	%r15, (%rax)
 	jbe	.LBB3_63
 	movl	$1, %eax
@@ -684,7 +678,7 @@ query_for_each:
 	movq	200(%rsp), %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
 	movq	%r15, (%rsp)
-	movq	136(%rsp), %rax
+	movq	128(%rsp), %rax
 	cmpq	%r15, (%rax)
 	jbe	.LBB3_72
 	movl	$1, %eax
@@ -802,14 +796,14 @@ query_for_each:
 	movq	%rax, 8(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
 	movq	%rax, 16(%rsp)
-	movq	144(%rsp), %rcx
+	movq	136(%rsp), %rcx
 	jmp	.LBB3_64
 .LBB3_72:
 	movq	%rsp, %rax
 	movq	%rax, 8(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
 	movq	%rax, 16(%rsp)
-	movq	136(%rsp), %rcx
+	movq	128(%rsp), %rcx
 .LBB3_64:
 	movq	%rcx, 24(%rsp)
 	movq	%rax, 32(%rsp)
@@ -896,7 +890,7 @@ query_for_each:
 	.type	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.9,@object
 	.section	.rodata..Lanon.0d252a227dcf2249288cd9db6e2d5b21.9,"a",@progbits
 .Lanon.0d252a227dcf2249288cd9db6e2d5b21.9:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/2701188/crates/bevy_ecs/src/query/state.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-11a63d9ba653d13e/56a7685/crates/bevy_ecs/src/query/state.rs"
 	.size	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.9, 97
 
 	.type	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.10,@object
diff --git a/results/query_state_get.s b/results/query_state_get.s
index 42b9e29..ee6c0a6 100644
--- a/results/query_state_get.s
+++ b/results/query_state_get.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"query_state_get.5cd79b9544daf506-cgu.0"
+	.file	"query_state_get.18b6bb1a99f29d13-cgu.0"
 	.section	.text.alloc::raw_vec::finish_grow,"ax",@progbits
 	.p2align	4, 0x90
 	.type	alloc::raw_vec::finish_grow,@function
@@ -314,12 +314,12 @@ query_get:
 	movq	400(%r15), %rsi
 	movq	24(%r8), %r10
 	movq	56(%r8), %r8
-	shlq	$4, %rdx
-	movq	8(%r8,%rdx), %rdx
+	movq	(%r8,%rdx,8), %rdx
+	notq	%rdx
 	leaq	(%rdx,%rdx,2), %rdx
 	shlq	$5, %rdx
-	shlq	$4, %rsi
-	movq	8(%r8,%rsi), %rsi
+	movq	(%r8,%rsi,8), %rsi
+	notq	%rsi
 	leaq	(%rsi,%rsi,2), %rsi
 	shlq	$5, %rsi
 	shlq	$2, %rdi
@@ -384,7 +384,7 @@ query_get:
 	leaq	80(%r15), %rax
 	movq	%rax, 152(%rsp)
 	leaq	104(%r15), %rax
-	movq	%rax, 96(%rsp)
+	movq	%rax, 88(%rsp)
 	leaq	112(%r15), %rax
 	movq	%rax, 240(%rsp)
 	leaq	136(%r15), %rax
@@ -422,14 +422,12 @@ query_get:
 	movq	128(%rbp), %r12
 	testq	%r12, %r12
 	je	.LBB3_15
-	shlq	$4, %rax
-	cmpq	$0, (%r12,%rax)
+	cmpq	$0, (%r12,%rax,8)
 	je	.LBB3_15
 	movq	400(%r15), %rax
 	cmpq	%rax, %rbx
 	jbe	.LBB3_15
-	shlq	$4, %rax
-	cmpq	$0, (%r12,%rax)
+	cmpq	$0, (%r12,%rax,8)
 	je	.LBB3_15
 	movq	336(%r15), %rax
 	testq	%rax, %rax
@@ -480,8 +478,7 @@ query_get:
 	jbe	.LBB3_43
 	leal	-1(%r8), %r11d
 	andl	%r8d, %r11d
-	shlq	$4, %r10
-	cmpq	$0, (%r12,%r10)
+	cmpq	$0, (%r12,%r10,8)
 	movl	%r11d, %r8d
 	jne	.LBB3_28
 	jmp	.LBB3_43
@@ -527,8 +524,7 @@ query_get:
 	orq	%r10, %r9
 	cmpq	%r9, %rbx
 	jbe	.LBB3_38
-	shlq	$4, %r9
-	cmpq	$0, (%r12,%r9)
+	cmpq	$0, (%r12,%r9,8)
 	je	.LBB3_38
 	.p2align	4, 0x90
 .LBB3_43:
@@ -536,7 +532,7 @@ query_get:
 	jne	.LBB3_23
 	jmp	.LBB3_15
 .LBB3_44:
-	movq	%r12, 88(%rsp)
+	movq	%r12, 96(%rsp)
 	movq	%rbx, 104(%rsp)
 	leaq	8(%rsp), %rdi
 	movq	232(%rsp), %rsi
@@ -584,12 +580,11 @@ query_get:
 	orq	%rcx, %rax
 	cmpq	%rax, 104(%rsp)
 	jbe	.LBB3_45
-	shlq	$4, %rax
-	movq	88(%rsp), %rcx
-	cmpq	$0, (%rcx,%rax)
+	movq	96(%rsp), %rcx
+	movq	(%rcx,%rax,8), %rax
+	testq	%rax, %rax
 	je	.LBB3_45
-	movq	88(%rsp), %rcx
-	movq	8(%rcx,%rax), %rax
+	notq	%rax
 	shlq	$4, %rax
 	movq	160(%rsp), %rcx
 	movq	(%rcx,%rax), %rax
@@ -599,7 +594,7 @@ query_get:
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
 	movq	112(%rsp), %rcx
 	movq	%rcx, (%rsp)
-	movq	96(%rsp), %rax
+	movq	88(%rsp), %rax
 	cmpq	%rcx, (%rax)
 	jbe	.LBB3_83
 	movl	$1, %eax
@@ -619,7 +614,7 @@ query_get:
 	testq	%rcx, %rcx
 	movq	fixedbitset::FixedBitSet::grow@GOTPCREL(%rip), %r12
 	movq	104(%rsp), %rdx
-	movq	88(%rsp), %rsi
+	movq	96(%rsp), %rsi
 	je	.LBB3_59
 	decq	%rax
 	movl	(%rcx), %ebx
@@ -632,7 +627,7 @@ query_get:
 	xorl	%ebp, %ebp
 	movq	fixedbitset::FixedBitSet::grow@GOTPCREL(%rip), %r12
 	movq	104(%rsp), %rdx
-	movq	88(%rsp), %rsi
+	movq	96(%rsp), %rsi
 .LBB3_59:
 	xorl	%r15d, %r15d
 	.p2align	4, 0x90
@@ -655,10 +650,10 @@ query_get:
 	orq	%rcx, %rax
 	cmpq	%rax, %rdx
 	jbe	.LBB3_60
-	shlq	$4, %rax
-	cmpq	$0, (%rsi,%rax)
+	movq	(%rsi,%rax,8), %rax
+	testq	%rax, %rax
 	je	.LBB3_60
-	movq	8(%rsi,%rax), %rax
+	notq	%rax
 	shlq	$4, %rax
 	movq	160(%rsp), %rcx
 	movq	(%rcx,%rax), %r13
@@ -667,7 +662,7 @@ query_get:
 	movq	%rsi, 112(%rsp)
 	callq	*%r12
 	movq	%r13, (%rsp)
-	movq	96(%rsp), %rax
+	movq	88(%rsp), %rax
 	cmpq	%r13, (%rax)
 	jbe	.LBB3_83
 	movq	%r12, %rdx
@@ -691,7 +686,7 @@ query_get:
 	orl	%r12d, (%rax,%r13,4)
 	movq	fixedbitset::FixedBitSet::grow@GOTPCREL(%rip), %r12
 	movq	104(%rsp), %rdx
-	movq	88(%rsp), %rsi
+	movq	96(%rsp), %rsi
 	jmp	.LBB3_60
 .LBB3_68:
 	movq	248(%rsp), %rbp
@@ -774,7 +769,7 @@ query_get:
 	movq	%rax, 56(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
 	movq	%rax, 64(%rsp)
-	movq	96(%rsp), %rcx
+	movq	88(%rsp), %rcx
 	jmp	.LBB3_85
 .LBB3_84:
 	movq	%rsp, %rax
@@ -900,7 +895,7 @@ query_get:
 	.type	.Lanon.161d7961c923b4e842c0f6e55225f2ee.9,@object
 	.section	.rodata..Lanon.161d7961c923b4e842c0f6e55225f2ee.9,"a",@progbits
 .Lanon.161d7961c923b4e842c0f6e55225f2ee.9:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/2701188/crates/bevy_ecs/src/query/state.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-11a63d9ba653d13e/56a7685/crates/bevy_ecs/src/query/state.rs"
 	.size	.Lanon.161d7961c923b4e842c0f6e55225f2ee.9, 97
 
 	.type	.Lanon.161d7961c923b4e842c0f6e55225f2ee.10,@object
diff --git a/results/query_state_get_sparse.s b/results/query_state_get_sparse.s
index a582638..8a45730 100644
--- a/results/query_state_get_sparse.s
+++ b/results/query_state_get_sparse.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"query_state_get_sparse.c482f98d255dce3a-cgu.0"
+	.file	"query_state_get_sparse.cb2262d3080ed785-cgu.0"
 	.section	.text.alloc::raw_vec::finish_grow,"ax",@progbits
 	.p2align	4, 0x90
 	.type	alloc::raw_vec::finish_grow,@function
@@ -309,10 +309,10 @@ query_state_get:
 	jbe	.LBB3_87
 	testq	%r9, %r9
 	je	.LBB3_87
-	shlq	$4, %rdi
-	cmpq	$0, (%r9,%rdi)
+	movq	(%r9,%rdi,8), %rdi
+	testq	%rdi, %rdi
 	je	.LBB3_86
-	movq	8(%r9,%rdi), %rdi
+	notq	%rdi
 	leaq	(%rdi,%rdi,8), %r8
 	shlq	$4, %r8
 	addq	224(%r11), %r8
@@ -364,7 +364,7 @@ query_state_get:
 	leaq	80(%r14), %rax
 	movq	%rax, 152(%rsp)
 	leaq	104(%r14), %rax
-	movq	%rax, 96(%rsp)
+	movq	%rax, 88(%rsp)
 	leaq	112(%r14), %rax
 	movq	%rax, 240(%rsp)
 	leaq	136(%r14), %rax
@@ -402,14 +402,12 @@ query_state_get:
 	movq	128(%rbp), %r12
 	testq	%r12, %r12
 	je	.LBB3_18
-	shlq	$4, %rax
-	cmpq	$0, (%r12,%rax)
+	cmpq	$0, (%r12,%rax,8)
 	je	.LBB3_18
 	movq	400(%r14), %rax
 	cmpq	%rax, %rbx
 	jbe	.LBB3_18
-	shlq	$4, %rax
-	cmpq	$0, (%r12,%rax)
+	cmpq	$0, (%r12,%rax,8)
 	je	.LBB3_18
 	movq	336(%r14), %rax
 	testq	%rax, %rax
@@ -460,8 +458,7 @@ query_state_get:
 	jbe	.LBB3_46
 	leal	-1(%r8), %r11d
 	andl	%r8d, %r11d
-	shlq	$4, %r10
-	cmpq	$0, (%r12,%r10)
+	cmpq	$0, (%r12,%r10,8)
 	movl	%r11d, %r8d
 	jne	.LBB3_31
 	jmp	.LBB3_46
@@ -507,8 +504,7 @@ query_state_get:
 	orq	%r10, %r9
 	cmpq	%r9, %rbx
 	jbe	.LBB3_41
-	shlq	$4, %r9
-	cmpq	$0, (%r12,%r9)
+	cmpq	$0, (%r12,%r9,8)
 	je	.LBB3_41
 	.p2align	4, 0x90
 .LBB3_46:
@@ -516,7 +512,7 @@ query_state_get:
 	jne	.LBB3_26
 	jmp	.LBB3_18
 .LBB3_47:
-	movq	%r12, 88(%rsp)
+	movq	%r12, 96(%rsp)
 	movq	%rbx, 104(%rsp)
 	leaq	8(%rsp), %rdi
 	movq	232(%rsp), %rsi
@@ -564,12 +560,11 @@ query_state_get:
 	orq	%rcx, %rax
 	cmpq	%rax, 104(%rsp)
 	jbe	.LBB3_48
-	shlq	$4, %rax
-	movq	88(%rsp), %rcx
-	cmpq	$0, (%rcx,%rax)
+	movq	96(%rsp), %rcx
+	movq	(%rcx,%rax,8), %rax
+	testq	%rax, %rax
 	je	.LBB3_48
-	movq	88(%rsp), %rcx
-	movq	8(%rcx,%rax), %rax
+	notq	%rax
 	shlq	$4, %rax
 	movq	160(%rsp), %rcx
 	movq	(%rcx,%rax), %rax
@@ -579,7 +574,7 @@ query_state_get:
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
 	movq	112(%rsp), %rcx
 	movq	%rcx, (%rsp)
-	movq	96(%rsp), %rax
+	movq	88(%rsp), %rax
 	cmpq	%rcx, (%rax)
 	jbe	.LBB3_105
 	movl	$1, %eax
@@ -599,7 +594,7 @@ query_state_get:
 	testq	%rcx, %rcx
 	movq	fixedbitset::FixedBitSet::grow@GOTPCREL(%rip), %r12
 	movq	104(%rsp), %rdx
-	movq	88(%rsp), %rsi
+	movq	96(%rsp), %rsi
 	je	.LBB3_62
 	decq	%rax
 	movl	(%rcx), %ebx
@@ -612,7 +607,7 @@ query_state_get:
 	xorl	%ebp, %ebp
 	movq	fixedbitset::FixedBitSet::grow@GOTPCREL(%rip), %r12
 	movq	104(%rsp), %rdx
-	movq	88(%rsp), %rsi
+	movq	96(%rsp), %rsi
 .LBB3_62:
 	xorl	%r14d, %r14d
 	.p2align	4, 0x90
@@ -635,10 +630,10 @@ query_state_get:
 	orq	%rcx, %rax
 	cmpq	%rax, %rdx
 	jbe	.LBB3_63
-	shlq	$4, %rax
-	cmpq	$0, (%rsi,%rax)
+	movq	(%rsi,%rax,8), %rax
+	testq	%rax, %rax
 	je	.LBB3_63
-	movq	8(%rsi,%rax), %rax
+	notq	%rax
 	shlq	$4, %rax
 	movq	160(%rsp), %rcx
 	movq	(%rcx,%rax), %r13
@@ -647,7 +642,7 @@ query_state_get:
 	movq	%rsi, 112(%rsp)
 	callq	*%r12
 	movq	%r13, (%rsp)
-	movq	96(%rsp), %rax
+	movq	88(%rsp), %rax
 	cmpq	%r13, (%rax)
 	jbe	.LBB3_105
 	movq	%r12, %rdx
@@ -671,7 +666,7 @@ query_state_get:
 	orl	%r12d, (%rax,%r13,4)
 	movq	fixedbitset::FixedBitSet::grow@GOTPCREL(%rip), %r12
 	movq	104(%rsp), %rdx
-	movq	88(%rsp), %rsi
+	movq	96(%rsp), %rsi
 	jmp	.LBB3_63
 .LBB3_71:
 	movq	248(%rsp), %rbp
@@ -757,10 +752,10 @@ query_state_get:
 	jbe	.LBB3_92
 	testq	%r9, %r9
 	je	.LBB3_92
-	shlq	$4, %rsi
-	cmpq	$0, (%r9,%rsi)
+	movq	(%r9,%rsi,8), %rsi
+	testq	%rsi, %rsi
 	je	.LBB3_91
-	movq	8(%r9,%rsi), %rsi
+	notq	%rsi
 	leaq	(%rsi,%rsi,8), %rdi
 	shlq	$4, %rdi
 	addq	224(%r11), %rdi
@@ -816,7 +811,7 @@ query_state_get:
 	movq	%rax, 56(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
 	movq	%rax, 64(%rsp)
-	movq	96(%rsp), %rcx
+	movq	88(%rsp), %rcx
 	jmp	.LBB3_107
 .LBB3_106:
 	movq	%rsp, %rax
@@ -942,7 +937,7 @@ query_state_get:
 	.type	.Lanon.df18cc41ae9ddb601fc5a42c06362435.9,@object
 	.section	.rodata..Lanon.df18cc41ae9ddb601fc5a42c06362435.9,"a",@progbits
 .Lanon.df18cc41ae9ddb601fc5a42c06362435.9:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/2701188/crates/bevy_ecs/src/query/state.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-11a63d9ba653d13e/56a7685/crates/bevy_ecs/src/query/state.rs"
 	.size	.Lanon.df18cc41ae9ddb601fc5a42c06362435.9, 97
 
 	.type	.Lanon.df18cc41ae9ddb601fc5a42c06362435.10,@object
diff --git a/results/query_state_iter.s b/results/query_state_iter.s
index 239b621..fba8e15 100644
--- a/results/query_state_iter.s
+++ b/results/query_state_iter.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"query_state_iter.cc361c473868df60-cgu.0"
+	.file	"query_state_iter.16fe8d76753ae698-cgu.0"
 	.section	.text.alloc::raw_vec::finish_grow,"ax",@progbits
 	.p2align	4, 0x90
 	.type	alloc::raw_vec::finish_grow,@function
@@ -302,10 +302,10 @@ query_state_iter:
 	testq	%rdi, %rdi
 	je	.LBB3_80
 	movq	56(%rbx), %r10
-	shlq	$4, %r9
-	movq	8(%r10,%r9), %r9
-	shlq	$4, %r8
-	movq	8(%r10,%r8), %r10
+	movq	(%r10,%r9,8), %r9
+	notq	%r9
+	movq	(%r10,%r8,8), %r10
+	notq	%r10
 	movq	24(%rbx), %r11
 	leaq	(%r9,%r9,2), %r9
 	shlq	$5, %r9
@@ -363,7 +363,7 @@ query_state_iter:
 	leaq	80(%r13), %rax
 	movq	%rax, 160(%rsp)
 	leaq	104(%r13), %rax
-	movq	%rax, 104(%rsp)
+	movq	%rax, 96(%rsp)
 	leaq	112(%r13), %rax
 	movq	%rax, 240(%rsp)
 	leaq	136(%r13), %rax
@@ -401,14 +401,12 @@ query_state_iter:
 	movq	128(%rbp), %r15
 	testq	%r15, %r15
 	je	.LBB3_76
-	shlq	$4, %rax
-	cmpq	$0, (%r15,%rax)
+	cmpq	$0, (%r15,%rax,8)
 	je	.LBB3_76
 	movq	400(%r13), %rax
 	cmpq	%rax, %rbx
 	jbe	.LBB3_76
-	shlq	$4, %rax
-	cmpq	$0, (%r15,%rax)
+	cmpq	$0, (%r15,%rax,8)
 	je	.LBB3_76
 	movq	336(%r13), %rax
 	testq	%rax, %rax
@@ -459,8 +457,7 @@ query_state_iter:
 	jbe	.LBB3_31
 	leal	-1(%r8), %r11d
 	andl	%r8d, %r11d
-	shlq	$4, %r10
-	cmpq	$0, (%r15,%r10)
+	cmpq	$0, (%r15,%r10,8)
 	movl	%r11d, %r8d
 	jne	.LBB3_16
 	jmp	.LBB3_31
@@ -506,8 +503,7 @@ query_state_iter:
 	orq	%r10, %r9
 	cmpq	%r9, %rbx
 	jbe	.LBB3_26
-	shlq	$4, %r9
-	cmpq	$0, (%r15,%r9)
+	cmpq	$0, (%r15,%r9,8)
 	je	.LBB3_26
 	.p2align	4, 0x90
 .LBB3_31:
@@ -515,18 +511,18 @@ query_state_iter:
 	jne	.LBB3_11
 	jmp	.LBB3_76
 .LBB3_32:
-	movq	%r15, 48(%rsp)
+	movq	%r15, 104(%rsp)
 	movq	%rbx, 112(%rsp)
-	leaq	56(%rsp), %rdi
+	leaq	48(%rsp), %rdi
 	movq	232(%rsp), %rsi
 	movq	224(%rsp), %rdx
 	callq	*fixedbitset::FixedBitSet::difference@GOTPCREL(%rip)
-	movq	56(%rsp), %r12
-	movq	64(%rsp), %r15
-	movq	72(%rsp), %r14
+	movq	48(%rsp), %r12
+	movq	56(%rsp), %r15
+	movq	64(%rsp), %r14
 	movq	%rbp, %rax
-	movl	80(%rsp), %ebp
-	movq	88(%rsp), %rbx
+	movl	72(%rsp), %ebp
+	movq	80(%rsp), %rbx
 	movq	%rax, 248(%rsp)
 	movq	96(%rax), %rax
 	movq	%rax, 168(%rsp)
@@ -563,12 +559,11 @@ query_state_iter:
 	orq	%rcx, %rax
 	cmpq	%rax, 112(%rsp)
 	jbe	.LBB3_33
-	shlq	$4, %rax
-	movq	48(%rsp), %rcx
-	cmpq	$0, (%rcx,%rax)
+	movq	104(%rsp), %rcx
+	movq	(%rcx,%rax,8), %rax
+	testq	%rax, %rax
 	je	.LBB3_33
-	movq	48(%rsp), %rcx
-	movq	8(%rcx,%rax), %rax
+	notq	%rax
 	shlq	$4, %rax
 	movq	168(%rsp), %rcx
 	movq	(%rcx,%rax), %rax
@@ -578,7 +573,7 @@ query_state_iter:
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
 	movq	120(%rsp), %rcx
 	movq	%rcx, 8(%rsp)
-	movq	104(%rsp), %rax
+	movq	96(%rsp), %rax
 	cmpq	%rcx, (%rax)
 	jbe	.LBB3_42
 	movl	$1, %eax
@@ -598,7 +593,7 @@ query_state_iter:
 	testq	%rcx, %rcx
 	movq	fixedbitset::FixedBitSet::grow@GOTPCREL(%rip), %r12
 	movq	112(%rsp), %rdx
-	movq	48(%rsp), %rsi
+	movq	104(%rsp), %rsi
 	je	.LBB3_49
 	decq	%rax
 	movl	(%rcx), %ebx
@@ -611,7 +606,7 @@ query_state_iter:
 	xorl	%ebp, %ebp
 	movq	fixedbitset::FixedBitSet::grow@GOTPCREL(%rip), %r12
 	movq	112(%rsp), %rdx
-	movq	48(%rsp), %rsi
+	movq	104(%rsp), %rsi
 .LBB3_49:
 	xorl	%r13d, %r13d
 	.p2align	4, 0x90
@@ -634,10 +629,10 @@ query_state_iter:
 	orq	%rcx, %rax
 	cmpq	%rax, %rdx
 	jbe	.LBB3_50
-	shlq	$4, %rax
-	cmpq	$0, (%rsi,%rax)
+	movq	(%rsi,%rax,8), %rax
+	testq	%rax, %rax
 	je	.LBB3_50
-	movq	8(%rsi,%rax), %rax
+	notq	%rax
 	shlq	$4, %rax
 	movq	168(%rsp), %rcx
 	movq	(%rcx,%rax), %r15
@@ -646,7 +641,7 @@ query_state_iter:
 	movq	%rsi, 120(%rsp)
 	callq	*%r12
 	movq	%r15, 8(%rsp)
-	movq	104(%rsp), %rax
+	movq	96(%rsp), %rax
 	cmpq	%r15, (%rax)
 	jbe	.LBB3_42
 	movq	%r12, %rdx
@@ -670,7 +665,7 @@ query_state_iter:
 	orl	%r12d, (%rax,%r15,4)
 	movq	fixedbitset::FixedBitSet::grow@GOTPCREL(%rip), %r12
 	movq	112(%rsp), %rdx
-	movq	48(%rsp), %rsi
+	movq	104(%rsp), %rsi
 	jmp	.LBB3_50
 .LBB3_59:
 	movq	248(%rsp), %rbp
@@ -748,7 +743,7 @@ query_state_iter:
 	movq	%rax, 16(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
 	movq	%rax, 24(%rsp)
-	movq	104(%rsp), %rcx
+	movq	96(%rsp), %rcx
 	jmp	.LBB3_43
 .LBB3_57:
 	leaq	8(%rsp), %rax
@@ -760,14 +755,14 @@ query_state_iter:
 	movq	%rcx, 32(%rsp)
 	movq	%rax, 40(%rsp)
 	leaq	.Lanon.742eb44106aac60011c15f8144ce6fe2.7(%rip), %rax
-	movq	%rax, 56(%rsp)
-	movq	$2, 64(%rsp)
-	movq	$0, 88(%rsp)
+	movq	%rax, 48(%rsp)
+	movq	$2, 56(%rsp)
+	movq	$0, 80(%rsp)
 	leaq	16(%rsp), %rax
-	movq	%rax, 72(%rsp)
-	movq	$2, 80(%rsp)
+	movq	%rax, 64(%rsp)
+	movq	$2, 72(%rsp)
 	leaq	.Lanon.742eb44106aac60011c15f8144ce6fe2.8(%rip), %rsi
-	leaq	56(%rsp), %rdi
+	leaq	48(%rsp), %rdi
 	callq	*core::panicking::panic_fmt@GOTPCREL(%rip)
 .LBB3_89:
 	leaq	.Lanon.742eb44106aac60011c15f8144ce6fe2.9(%rip), %rdi
@@ -797,14 +792,14 @@ query_state_iter:
 	movq	%rcx, 32(%rsp)
 	movq	%rax, 40(%rsp)
 	leaq	.Lanon.742eb44106aac60011c15f8144ce6fe2.2(%rip), %rax
-	movq	%rax, 56(%rsp)
-	movq	$2, 64(%rsp)
-	movq	$0, 88(%rsp)
+	movq	%rax, 48(%rsp)
+	movq	$2, 56(%rsp)
+	movq	$0, 80(%rsp)
 	leaq	16(%rsp), %rax
-	movq	%rax, 72(%rsp)
-	movq	$2, 80(%rsp)
+	movq	%rax, 64(%rsp)
+	movq	$2, 72(%rsp)
 	leaq	.Lanon.742eb44106aac60011c15f8144ce6fe2.4(%rip), %rsi
-	leaq	56(%rsp), %rdi
+	leaq	48(%rsp), %rdi
 	callq	*core::panicking::panic_fmt@GOTPCREL(%rip)
 .Lfunc_end3:
 	.size	query_state_iter, .Lfunc_end3-query_state_iter
@@ -885,7 +880,7 @@ query_state_iter:
 	.type	.Lanon.742eb44106aac60011c15f8144ce6fe2.10,@object
 	.section	.rodata..Lanon.742eb44106aac60011c15f8144ce6fe2.10,"a",@progbits
 .Lanon.742eb44106aac60011c15f8144ce6fe2.10:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/2701188/crates/bevy_ecs/src/storage/table.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-11a63d9ba653d13e/56a7685/crates/bevy_ecs/src/storage/table.rs"
 	.size	.Lanon.742eb44106aac60011c15f8144ce6fe2.10, 99
 
 	.type	.Lanon.742eb44106aac60011c15f8144ce6fe2.11,@object
@@ -899,7 +894,7 @@ query_state_iter:
 	.type	.Lanon.742eb44106aac60011c15f8144ce6fe2.12,@object
 	.section	.rodata..Lanon.742eb44106aac60011c15f8144ce6fe2.12,"a",@progbits
 .Lanon.742eb44106aac60011c15f8144ce6fe2.12:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/2701188/crates/bevy_ecs/src/query/state.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-11a63d9ba653d13e/56a7685/crates/bevy_ecs/src/query/state.rs"
 	.size	.Lanon.742eb44106aac60011c15f8144ce6fe2.12, 97
 
 	.type	.Lanon.742eb44106aac60011c15f8144ce6fe2.13,@object
diff --git a/results/query_state_iter_sparse.s b/results/query_state_iter_sparse.s
index 3220ddf..2099715 100644
--- a/results/query_state_iter_sparse.s
+++ b/results/query_state_iter_sparse.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"query_state_iter_sparse.339142dc9b536d36-cgu.0"
+	.file	"query_state_iter_sparse.2721b940840ba270-cgu.0"
 	.section	.text.alloc::raw_vec::finish_grow,"ax",@progbits
 	.p2align	4, 0x90
 	.type	alloc::raw_vec::finish_grow,@function
@@ -282,10 +282,10 @@ query_state_iter:
 	jbe	.LBB3_7
 	testq	%rsi, %rsi
 	je	.LBB3_7
-	shlq	$4, %rcx
-	cmpq	$0, (%rsi,%rcx)
+	movq	(%rsi,%rcx,8), %rax
+	testq	%rax, %rax
 	je	.LBB3_79
-	movq	8(%rsi,%rcx), %rax
+	notq	%rax
 	leaq	(%rax,%rax,8), %rax
 	shlq	$4, %rax
 	addq	224(%r8), %rax
@@ -296,10 +296,10 @@ query_state_iter:
 .LBB3_8:
 	testq	%rsi, %rsi
 	je	.LBB3_81
-	shlq	$4, %rdx
-	cmpq	$0, (%rsi,%rdx)
+	movq	(%rsi,%rdx,8), %rcx
+	testq	%rcx, %rcx
 	je	.LBB3_80
-	movq	8(%rsi,%rdx), %rcx
+	notq	%rcx
 	leaq	(%rcx,%rcx,8), %rcx
 	shlq	$4, %rcx
 	addq	224(%r8), %rcx
@@ -314,7 +314,7 @@ query_state_iter:
 	leaq	216(%r14), %rax
 	movq	%rax, 232(%rsp)
 	leaq	80(%r14), %rax
-	movq	%rax, 144(%rsp)
+	movq	%rax, 136(%rsp)
 	leaq	104(%r14), %rax
 	movq	%rax, 88(%rsp)
 	leaq	112(%r14), %rax
@@ -324,16 +324,16 @@ query_state_iter:
 	leaq	48(%r14), %rax
 	movq	%rax, 200(%rsp)
 	leaq	72(%r14), %rax
-	movq	%rax, 136(%rsp)
+	movq	%rax, 128(%rsp)
 	leaq	368(%r14), %rax
 	movq	%rax, 184(%rsp)
 	leaq	16(%r14), %rax
 	movq	%rax, 192(%rsp)
 	leaq	40(%r14), %rax
-	movq	%rax, 128(%rsp)
+	movq	%rax, 120(%rsp)
 	leaq	344(%r14), %rax
 	movq	%rax, 176(%rsp)
-	movq	%r14, 120(%rsp)
+	movq	%r14, 112(%rsp)
 	movq	%r13, 224(%rsp)
 	movq	%r12, 216(%rsp)
 	jmp	.LBB3_14
@@ -355,14 +355,12 @@ query_state_iter:
 	movq	128(%rbp), %r15
 	testq	%r15, %r15
 	je	.LBB3_13
-	shlq	$4, %rax
-	cmpq	$0, (%r15,%rax)
+	cmpq	$0, (%r15,%rax,8)
 	je	.LBB3_13
 	movq	400(%r14), %rax
 	cmpq	%rax, %rbx
 	jbe	.LBB3_13
-	shlq	$4, %rax
-	cmpq	$0, (%r15,%rax)
+	cmpq	$0, (%r15,%rax,8)
 	je	.LBB3_13
 	movq	336(%r14), %rax
 	testq	%rax, %rax
@@ -413,8 +411,7 @@ query_state_iter:
 	jbe	.LBB3_41
 	leal	-1(%r8), %r11d
 	andl	%r8d, %r11d
-	shlq	$4, %r10
-	cmpq	$0, (%r15,%r10)
+	cmpq	$0, (%r15,%r10,8)
 	movl	%r11d, %r8d
 	jne	.LBB3_26
 	jmp	.LBB3_41
@@ -460,8 +457,7 @@ query_state_iter:
 	orq	%r10, %r9
 	cmpq	%r9, %rbx
 	jbe	.LBB3_36
-	shlq	$4, %r9
-	cmpq	$0, (%r15,%r9)
+	cmpq	$0, (%r15,%r9,8)
 	je	.LBB3_36
 	.p2align	4, 0x90
 .LBB3_41:
@@ -469,7 +465,7 @@ query_state_iter:
 	jne	.LBB3_21
 	jmp	.LBB3_13
 .LBB3_42:
-	movq	%r15, 96(%rsp)
+	movq	%r15, 152(%rsp)
 	movq	%rbx, 160(%rsp)
 	leaq	40(%rsp), %rdi
 	movq	240(%rsp), %rsi
@@ -483,7 +479,7 @@ query_state_iter:
 	movq	72(%rsp), %rsi
 	movq	%rax, 256(%rsp)
 	movq	96(%rax), %rax
-	movq	%rax, 152(%rsp)
+	movq	%rax, 144(%rsp)
 	.p2align	4, 0x90
 .LBB3_43:
 	testl	%ebp, %ebp
@@ -517,21 +513,20 @@ query_state_iter:
 	orq	%rcx, %rax
 	cmpq	%rax, 160(%rsp)
 	jbe	.LBB3_43
-	shlq	$4, %rax
-	movq	96(%rsp), %rcx
-	cmpq	$0, (%rcx,%rax)
+	movq	152(%rsp), %rcx
+	movq	(%rcx,%rax,8), %rax
+	testq	%rax, %rax
 	je	.LBB3_43
-	movq	%rsi, 104(%rsp)
-	movq	96(%rsp), %rcx
-	movq	8(%rcx,%rax), %rax
+	movq	%rsi, 96(%rsp)
+	notq	%rax
 	shlq	$4, %rax
-	movq	152(%rsp), %rcx
+	movq	144(%rsp), %rcx
 	movq	(%rcx,%rax), %rax
-	movq	%rax, 112(%rsp)
+	movq	%rax, 104(%rsp)
 	leaq	1(%rax), %rsi
-	movq	144(%rsp), %rdi
+	movq	136(%rsp), %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-	movq	112(%rsp), %rcx
+	movq	104(%rsp), %rcx
 	movq	%rcx, (%rsp)
 	movq	88(%rsp), %rax
 	cmpq	%rcx, (%rax)
@@ -541,7 +536,7 @@ query_state_iter:
 	movq	88(%r14), %rdx
 	shrq	$5, %rcx
 	orl	%eax, (%rdx,%rcx,4)
-	movq	104(%rsp), %rsi
+	movq	96(%rsp), %rsi
 	jmp	.LBB3_43
 .LBB3_53:
 	movq	232(%r14), %rax
@@ -586,18 +581,17 @@ query_state_iter:
 	orq	%rcx, %rax
 	cmpq	%rax, 160(%rsp)
 	jbe	.LBB3_58
-	shlq	$4, %rax
-	movq	96(%rsp), %rcx
-	cmpq	$0, (%rcx,%rax)
+	movq	152(%rsp), %rcx
+	movq	(%rcx,%rax,8), %rax
+	testq	%rax, %rax
 	je	.LBB3_58
-	movq	96(%rsp), %rcx
-	movq	8(%rcx,%rax), %rax
+	notq	%rax
 	shlq	$4, %rax
-	movq	152(%rsp), %rcx
+	movq	144(%rsp), %rcx
 	movq	(%rcx,%rax), %r12
 	leaq	1(%r12), %rsi
-	movq	144(%rsp), %rdi
-	movq	%rsi, 112(%rsp)
+	movq	136(%rsp), %rdi
+	movq	%rsi, 104(%rsp)
 	callq	*%r15
 	movq	%r12, (%rsp)
 	movq	88(%rsp), %rax
@@ -607,17 +601,17 @@ query_state_iter:
 	movq	%r12, %r15
 	shrq	$5, %r15
 	movq	%r12, %rcx
-	movq	%r12, 104(%rsp)
+	movq	%r12, 96(%rsp)
 	movl	$1, %r12d
 	shll	%cl, %r12d
-	movq	120(%rsp), %rax
+	movq	112(%rsp), %rax
 	movq	88(%rax), %rax
 	orl	%r12d, (%rax,%r15,4)
 	movq	248(%rsp), %rdi
-	movq	112(%rsp), %rsi
+	movq	104(%rsp), %rsi
 	callq	*%rdx
-	movq	120(%rsp), %rax
-	movq	104(%rsp), %rcx
+	movq	112(%rsp), %rax
+	movq	96(%rsp), %rcx
 	movq	%rcx, (%rsp)
 	cmpq	%rcx, 136(%rax)
 	jbe	.LBB3_100
@@ -630,7 +624,7 @@ query_state_iter:
 	movl	144(%rbp), %r15d
 	movl	%r15d, %ebx
 	shrl	$5, %ebx
-	movq	120(%rsp), %r14
+	movq	112(%rsp), %r14
 	cmpq	64(%r14), %rbx
 	movq	224(%rsp), %r13
 	movq	216(%rsp), %r12
@@ -646,7 +640,7 @@ query_state_iter:
 	movq	200(%rsp), %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
 	movq	%r15, (%rsp)
-	movq	136(%rsp), %rax
+	movq	128(%rsp), %rax
 	cmpq	%r15, (%rax)
 	jbe	.LBB3_104
 	movl	$1, %eax
@@ -682,7 +676,7 @@ query_state_iter:
 	movq	192(%rsp), %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
 	movq	%r15, (%rsp)
-	movq	128(%rsp), %rax
+	movq	120(%rsp), %rax
 	cmpq	%r15, (%rax)
 	jbe	.LBB3_105
 	movl	$1, %eax
@@ -827,14 +821,14 @@ query_state_iter:
 	movq	%rax, 8(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
 	movq	%rax, 16(%rsp)
-	movq	136(%rsp), %rcx
+	movq	128(%rsp), %rcx
 	jmp	.LBB3_106
 .LBB3_105:
 	movq	%rsp, %rax
 	movq	%rax, 8(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
 	movq	%rax, 16(%rsp)
-	movq	128(%rsp), %rcx
+	movq	120(%rsp), %rcx
 .LBB3_106:
 	movq	%rcx, 24(%rsp)
 	movq	%rax, 32(%rsp)
@@ -921,7 +915,7 @@ query_state_iter:
 	.type	.Lanon.742eb44106aac60011c15f8144ce6fe2.9,@object
 	.section	.rodata..Lanon.742eb44106aac60011c15f8144ce6fe2.9,"a",@progbits
 .Lanon.742eb44106aac60011c15f8144ce6fe2.9:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/2701188/crates/bevy_ecs/src/query/state.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-11a63d9ba653d13e/56a7685/crates/bevy_ecs/src/query/state.rs"
 	.size	.Lanon.742eb44106aac60011c15f8144ce6fe2.9, 97
 
 	.type	.Lanon.742eb44106aac60011c15f8144ce6fe2.10,@object
diff --git a/results/resource_get.s b/results/resource_get.s
index 8c771f6..32eb914 100644
--- a/results/resource_get.s
+++ b/results/resource_get.s
@@ -1,26 +1,26 @@
 	.text
-	.file	"resource_get.6f6a4a8f15016c8e-cgu.0"
+	.file	"resource_get.84907f2c91b6126c-cgu.0"
 	.section	.rodata.cst16,"aM",@progbits,16
 	.p2align	4, 0x0
 .LCPI0_0:
-	.zero	16,47
+	.zero	16,51
 .LCPI0_1:
-	.byte	125
-	.byte	178
-	.byte	41
-	.byte	81
-	.byte	237
-	.byte	205
-	.byte	105
-	.byte	94
-	.byte	50
-	.byte	7
-	.byte	44
-	.byte	51
-	.byte	77
-	.byte	22
-	.byte	119
-	.byte	35
+	.byte	90
+	.byte	72
+	.byte	162
+	.byte	218
+	.byte	124
+	.byte	136
+	.byte	215
+	.byte	102
+	.byte	124
+	.byte	241
+	.byte	86
+	.byte	230
+	.byte	139
+	.byte	55
+	.byte	102
+	.byte	156
 	.section	.text.resource_get,"ax",@progbits
 	.globl	resource_get
 	.p2align	4, 0x90
@@ -39,7 +39,7 @@ resource_get:
 	movq	120(%rsi), %rcx
 	movq	128(%rsi), %rdx
 	leaq	-24(%rcx), %rdi
-	movabsq	$6803195131272475261, %r8
+	movabsq	$7410541781686831194, %r8
 	xorl	%r9d, %r9d
 	movdqa	.LCPI0_0(%rip), %xmm0
 	pcmpeqd	%xmm1, %xmm1
@@ -85,26 +85,26 @@ resource_get:
 	movq	400(%rsi), %rdx
 	testq	%rdx, %rdx
 	je	.LBB0_11
-	shlq	$4, %rcx
-	cmpq	$0, (%rdx,%rcx)
+	movq	(%rdx,%rcx,8), %rdx
+	testq	%rdx, %rdx
 	je	.LBB0_11
-	movq	352(%rsi), %rdi
-	movq	8(%rdx,%rcx), %rcx
-	leaq	(%rcx,%rcx,2), %rcx
-	shlq	$5, %rcx
-	cmpq	$0, 32(%rdi,%rcx)
+	movq	352(%rsi), %rcx
+	notq	%rdx
+	leaq	(%rdx,%rdx,2), %rdx
+	shlq	$5, %rdx
+	cmpq	$0, 32(%rcx,%rdx)
 	je	.LBB0_11
-	leaq	(%rdi,%rcx), %rdx
-	movq	16(%rdx), %rdx
-	leaq	(%rdi,%rcx), %r8
+	leaq	(%rcx,%rdx), %rdi
+	movq	16(%rdi), %rdi
+	leaq	(%rcx,%rdx), %r8
 	addq	$88, %r8
-	leaq	92(%rdi,%rcx), %rcx
-	movl	764(%rsi), %edi
+	leaq	92(%rcx,%rdx), %rcx
+	movl	764(%rsi), %edx
 	movl	760(%rsi), %esi
-	movq	%rdx, (%rax)
+	movq	%rdi, (%rax)
 	movq	%r8, 8(%rax)
 	movq	%rcx, 16(%rax)
-	movl	%edi, 24(%rax)
+	movl	%edx, 24(%rax)
 	movl	%esi, 28(%rax)
 	popq	%rbx
 	.cfi_def_cfa_offset 16
diff --git a/results/resource_insert.s b/results/resource_insert.s
index 96c958e..27ade47 100644
--- a/results/resource_insert.s
+++ b/results/resource_insert.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"resource_insert.aac6385c31cd39f9-cgu.0"
+	.file	"resource_insert.1ffa82c17cea95d-cgu.0"
 	.section	".text.<&T as core::fmt::Display>::fmt","ax",@progbits
 	.p2align	4, 0x90
 	.type	<&T as core::fmt::Display>::fmt,@function
@@ -108,19 +108,16 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	cmpq	$5, %rsi
 	movl	$4, %r14d
 	cmovaeq	%rsi, %r14
-	movabsq	$96076792050570582, %rcx
 	xorl	%esi, %esi
-	cmpq	%rcx, %r14
-	setb	%sil
 	movq	%r14, %rcx
-	shlq	$5, %rcx
-	leaq	(%rcx,%rcx,2), %rdx
+	shrq	$60, %rcx
+	sete	%sil
+	leaq	(,%r14,8), %rdx
 	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB2_2
 	movq	8(%rbx), %rcx
-	shlq	$5, %rax
-	leaq	(%rax,%rax,2), %rax
+	shlq	$3, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -191,16 +188,16 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	cmpq	$5, %rsi
 	movl	$4, %r14d
 	cmovaeq	%rsi, %r14
+	movabsq	$104811045873349726, %rcx
 	xorl	%esi, %esi
-	movq	%r14, %rcx
-	shrq	$60, %rcx
-	sete	%sil
-	leaq	(,%r14,8), %rdx
+	cmpq	%rcx, %r14
+	setb	%sil
+	imulq	$88, %r14, %rdx
 	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB3_2
 	movq	8(%rbx), %rcx
-	shlq	$3, %rax
+	imulq	$88, %rax, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -271,16 +268,19 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	cmpq	$5, %rsi
 	movl	$4, %r14d
 	cmovaeq	%rsi, %r14
-	movabsq	$104811045873349726, %rcx
+	movabsq	$96076792050570582, %rcx
 	xorl	%esi, %esi
 	cmpq	%rcx, %r14
 	setb	%sil
-	imulq	$88, %r14, %rdx
+	movq	%r14, %rcx
+	shlq	$5, %rcx
+	leaq	(%rcx,%rcx,2), %rdx
 	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB4_2
 	movq	8(%rbx), %rcx
-	imulq	$88, %rax, %rax
+	shlq	$5, %rax
+	leaq	(%rax,%rax,2), %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -353,15 +353,14 @@ alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle:
 	cmovaeq	%rsi, %r14
 	xorl	%esi, %esi
 	movq	%r14, %rcx
-	shrq	$59, %rcx
+	shrq	$60, %rcx
 	sete	%sil
-	movq	%r14, %rdx
-	shlq	$4, %rdx
+	leaq	(,%r14,8), %rdx
 	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB5_2
 	movq	8(%rbx), %rcx
-	shlq	$4, %rax
+	shlq	$3, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -882,14 +881,14 @@ hashbrown::raw::inner::RawTable<T,A>::reserve_rehash:
 	retq
 .LBB6_12:
 	.cfi_def_cfa_offset 128
-	leaq	.Lanon.7389e6565b10821dad2f4dd8892551e5.12(%rip), %rax
+	leaq	.Lanon.7389e6565b10821dad2f4dd8892551e5.13(%rip), %rax
 	movq	%rax, 16(%rsp)
 	movq	$1, 24(%rsp)
 	leaq	.Lanon.7389e6565b10821dad2f4dd8892551e5.0(%rip), %rax
 	movq	%rax, 32(%rsp)
 	xorps	%xmm0, %xmm0
 	movups	%xmm0, 40(%rsp)
-	leaq	.Lanon.7389e6565b10821dad2f4dd8892551e5.14(%rip), %rsi
+	leaq	.Lanon.7389e6565b10821dad2f4dd8892551e5.15(%rip), %rsi
 	leaq	16(%rsp), %rdi
 	callq	*core::panicking::panic_fmt@GOTPCREL(%rip)
 .Lfunc_end6:
@@ -899,7 +898,7 @@ hashbrown::raw::inner::RawTable<T,A>::reserve_rehash:
 	.section	.rodata.cst16,"aM",@progbits,16
 	.p2align	4, 0x0
 .LCPI7_0:
-	.zero	16,113
+	.zero	16,9
 	.section	.text.resource_insert,"ax",@progbits
 	.globl	resource_insert
 	.p2align	4, 0x90
@@ -930,8 +929,8 @@ resource_insert:
 	.cfi_offset %r15, -24
 	.cfi_offset %rbp, -16
 	movq	%rdi, %rbx
-	movabsq	$-6921847066145076660, %r14
-	movabsq	$-2043061543111480909, %r12
+	movabsq	$-7580809775502447986, %r14
+	movabsq	$1420493887941312850, %r12
 	movq	%r12, %r15
 	addq	$64, %rdi
 	movq	120(%rbx), %rax
@@ -971,7 +970,7 @@ resource_insert:
 	pcmpeqb	%xmm1, %xmm2
 	pmovmskb	%xmm2, %r9d
 	testl	%r9d, %r9d
-	jne	.LBB7_42
+	jne	.LBB7_38
 	addq	%rsi, %r8
 	addq	$16, %r8
 	addq	$16, %rsi
@@ -979,7 +978,7 @@ resource_insert:
 .LBB7_6:
 	movq	-8(%rax,%r10,8), %r13
 .LBB7_7:
-	movd	%xmm0, 20(%rsp)
+	movd	%xmm0, 12(%rsp)
 	movl	760(%rbx), %ebp
 	movq	400(%rbx), %rcx
 	movq	408(%rbx), %r15
@@ -987,19 +986,18 @@ resource_insert:
 	jbe	.LBB7_14
 	testq	%rcx, %rcx
 	je	.LBB7_14
-	movq	%r13, %rax
-	shlq	$4, %rax
-	cmpq	$0, (%rcx,%rax)
+	movq	(%rcx,%r13,8), %rax
+	testq	%rax, %rax
 	je	.LBB7_14
-	movq	8(%rcx,%rax), %rax
+	notq	%rax
 	leaq	(%rax,%rax,2), %r14
 	shlq	$5, %r14
 	addq	352(%rbx), %r14
 	cmpq	$0, 32(%r14)
-	jne	.LBB7_40
+	jne	.LBB7_36
 .LBB7_11:
 	cmpq	$0, 24(%r14)
-	je	.LBB7_52
+	je	.LBB7_48
 	xorl	%edi, %edi
 .LBB7_13:
 	leaq	1(%rdi), %rax
@@ -1007,27 +1005,27 @@ resource_insert:
 	movq	8(%r14), %rdx
 	imulq	%rdx, %rdi
 	addq	16(%r14), %rdi
-	leaq	20(%rsp), %rsi
+	leaq	12(%rsp), %rsi
 	callq	*memcpy@GOTPCREL(%rip)
 	movl	%ebp, 88(%r14)
-	jmp	.LBB7_41
+	jmp	.LBB7_37
 .LBB7_14:
 	cmpq	%r13, 80(%rbx)
-	jbe	.LBB7_60
+	jbe	.LBB7_55
 	movq	72(%rbx), %r14
 	testq	%r14, %r14
-	je	.LBB7_60
-	movq	%rcx, 24(%rsp)
-	movl	%ebp, 16(%rsp)
-	movq	%r13, 8(%rsp)
+	je	.LBB7_55
+	movq	%rcx, (%rsp)
+	movl	%ebp, 8(%rsp)
+	movq	%r13, 120(%rsp)
 	imulq	$88, %r13, %rax
 	addq	%rax, %r14
 	cmpb	$0, 73(%r14)
-	je	.LBB7_61
+	je	.LBB7_56
 	movq	24(%r14), %rsi
 	movq	32(%r14), %rdx
 	movq	64(%r14), %rcx
-	leaq	32(%rsp), %rdi
+	leaq	16(%rsp), %rdi
 	movl	$1, %r13d
 	movl	$1, %r8d
 	callq	*bevy_ecs::storage::blob_vec::BlobVec::new@GOTPCREL(%rip)
@@ -1035,7 +1033,7 @@ resource_insert:
 	movq	56(%r14), %r12
 	testq	%r12, %r12
 	je	.LBB7_20
-	js	.LBB7_62
+	js	.LBB7_59
 	movq	__rust_no_alloc_shim_is_unstable@GOTPCREL(%rip), %rax
 	movzbl	(%rax), %eax
 	movl	$1, %esi
@@ -1043,7 +1041,7 @@ resource_insert:
 	callq	*__rust_alloc@GOTPCREL(%rip)
 	movq	%rax, %r13
 	testq	%rax, %rax
-	je	.LBB7_63
+	je	.LBB7_60
 .LBB7_20:
 	leaq	152(%rbx), %r14
 	movq	%r13, %rdi
@@ -1054,9 +1052,9 @@ resource_insert:
 	movq	%r14, %rdi
 	callq	*bevy_ecs::archetype::Archetypes::new_archetype_component_id@GOTPCREL(%rip)
 .Ltmp1:
-	movdqu	32(%rsp), %xmm0
-	movdqu	48(%rsp), %xmm1
-	movdqu	64(%rsp), %xmm2
+	movdqu	16(%rsp), %xmm0
+	movdqu	32(%rsp), %xmm1
+	movdqu	48(%rsp), %xmm2
 	movdqa	%xmm2, 160(%rsp)
 	movdqa	%xmm1, 144(%rsp)
 	movdqa	%xmm0, 128(%rsp)
@@ -1067,105 +1065,88 @@ resource_insert:
 	pxor	%xmm0, %xmm0
 	movdqa	%xmm0, 208(%rsp)
 	movq	360(%rbx), %r14
-	movq	8(%rsp), %r12
-	cmpq	%r12, %r15
-	jbe	.LBB7_23
-	movq	24(%rsp), %rdi
-	jmp	.LBB7_31
-.LBB7_23:
+	cmpq	$-1, %r14
+	je	.LBB7_57
+	movq	120(%rsp), %r13
+	cmpq	%r13, %r15
+	ja	.LBB7_28
 	leaq	392(%rbx), %rdi
-	movq	%r12, %rdx
-	subq	%r15, %rdx
-	incq	%rdx
+	movq	%r13, %r12
+	subq	%r15, %r12
+	incq	%r12
 	movq	(%rdi), %rax
 	subq	%r15, %rax
-	cmpq	%rdx, %rax
+	cmpq	%r12, %rax
 	jae	.LBB7_26
 .Ltmp3:
 	movq	%r15, %rsi
+	movq	%r12, %rdx
 	callq	alloc::raw_vec::RawVec<T,A>::reserve::do_reserve_and_handle
 .Ltmp4:
-	movq	400(%rbx), %rdi
-	movq	408(%rbx), %rax
+	movq	400(%rbx), %rax
+	movq	408(%rbx), %r15
 	jmp	.LBB7_27
 .LBB7_26:
-	movq	%r15, %rax
-	testq	%rdx, %rdx
-	movq	24(%rsp), %rdi
-	je	.LBB7_30
+	movq	(%rsp), %rax
 .LBB7_27:
-	movq	%rax, %rcx
-	shlq	$4, %rcx
-	addq	%rdi, %rcx
-	movq	%r12, %rdx
-	notq	%rdx
-	addq	%r15, %rdx
+	movq	%rax, (%rsp)
+	leaq	(%rax,%r15,8), %rdi
+	leaq	(,%r12,8), %rdx
 	xorl	%esi, %esi
-	.p2align	4, 0x90
-.LBB7_28:
-	movq	$0, (%rcx)
-	decq	%rsi
-	addq	$16, %rcx
-	cmpq	%rsi, %rdx
-	jne	.LBB7_28
-	subq	%rsi, %rax
-	movq	%rax, %r15
-.LBB7_30:
+	callq	*memset@GOTPCREL(%rip)
+	addq	%r12, %r15
 	movq	%r15, 408(%rbx)
-.LBB7_31:
-	cmpq	%r12, %r15
-	jbe	.LBB7_58
-	movq	%r12, %rax
-	shlq	$4, %rax
-	movq	$1, (%rdi,%rax)
-	movq	%r14, 8(%rdi,%rax)
+.LBB7_28:
+	movl	8(%rsp), %ebp
+	cmpq	%r13, %r15
+	jbe	.LBB7_54
+	movq	%r14, %rax
+	notq	%rax
+	movq	(%rsp), %rcx
+	movq	%rax, (%rcx,%r13,8)
 	movq	384(%rbx), %rsi
 	cmpq	368(%rbx), %rsi
-	jne	.LBB7_35
+	jne	.LBB7_32
 .Ltmp7:
 	leaq	368(%rbx), %rdi
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
 .Ltmp8:
 	movq	384(%rbx), %rsi
-.LBB7_35:
+.LBB7_32:
 	movq	376(%rbx), %rax
-	movq	%r12, (%rax,%rsi,8)
+	movq	%r13, (%rax,%rsi,8)
 	incq	%rsi
 	movq	%rsi, 384(%rbx)
 	movaps	208(%rsp), %xmm0
-	movaps	%xmm0, 112(%rsp)
-	movaps	192(%rsp), %xmm0
 	movaps	%xmm0, 96(%rsp)
+	movaps	192(%rsp), %xmm0
+	movaps	%xmm0, 80(%rsp)
 	movdqa	128(%rsp), %xmm0
 	movdqa	144(%rsp), %xmm1
 	movdqa	160(%rsp), %xmm2
 	movdqa	176(%rsp), %xmm3
-	movdqa	%xmm3, 80(%rsp)
-	movdqa	%xmm2, 64(%rsp)
-	movdqa	%xmm1, 48(%rsp)
-	movdqa	%xmm0, 32(%rsp)
+	movdqa	%xmm3, 64(%rsp)
+	movdqa	%xmm2, 48(%rsp)
+	movdqa	%xmm1, 32(%rsp)
+	movdqa	%xmm0, 16(%rsp)
 	movq	360(%rbx), %rsi
 	cmpq	344(%rbx), %rsi
-	jne	.LBB7_38
-.Ltmp15:
+	jne	.LBB7_35
+.Ltmp10:
 	leaq	344(%rbx), %rdi
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
-.Ltmp16:
-	movl	16(%rsp), %ebp
+.Ltmp11:
 	movq	360(%rbx), %rsi
-	jmp	.LBB7_39
-.LBB7_38:
-	movl	16(%rsp), %ebp
-.LBB7_39:
+.LBB7_35:
 	movq	352(%rbx), %rax
 	leaq	(%rsi,%rsi,2), %rcx
 	shlq	$5, %rcx
-	movdqa	32(%rsp), %xmm0
-	movdqa	48(%rsp), %xmm1
-	movdqa	64(%rsp), %xmm2
-	movdqa	80(%rsp), %xmm3
-	movdqa	96(%rsp), %xmm4
-	movaps	112(%rsp), %xmm5
+	movdqa	16(%rsp), %xmm0
+	movdqa	32(%rsp), %xmm1
+	movdqa	48(%rsp), %xmm2
+	movdqa	64(%rsp), %xmm3
+	movdqa	80(%rsp), %xmm4
+	movaps	96(%rsp), %xmm5
 	movups	%xmm5, 80(%rax,%rcx)
 	movdqu	%xmm4, 64(%rax,%rcx)
 	movdqu	%xmm3, 48(%rax,%rcx)
@@ -1179,12 +1160,12 @@ resource_insert:
 	addq	%rax, %r14
 	cmpq	$0, 32(%r14)
 	je	.LBB7_11
-.LBB7_40:
-	leaq	20(%rsp), %rdx
+.LBB7_36:
+	leaq	12(%rsp), %rdx
 	movq	%r14, %rdi
 	xorl	%esi, %esi
 	callq	*bevy_ecs::storage::blob_vec::BlobVec::replace_unchecked@GOTPCREL(%rip)
-.LBB7_41:
+.LBB7_37:
 	movl	%ebp, 92(%r14)
 	addq	$248, %rsp
 	.cfi_def_cfa_offset 56
@@ -1201,20 +1182,20 @@ resource_insert:
 	popq	%rbp
 	.cfi_def_cfa_offset 8
 	retq
-.LBB7_42:
+.LBB7_38:
 	.cfi_def_cfa_offset 304
 	movq	80(%rbx), %r13
 	movq	%r13, %rdx
 	cmpq	64(%rbx), %r13
-	jne	.LBB7_44
+	jne	.LBB7_40
 	movq	%r13, %rsi
-	movss	%xmm0, 8(%rsp)
+	movss	%xmm0, (%rsp)
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
-	movd	8(%rsp), %xmm0
+	movd	(%rsp), %xmm0
 	movq	80(%rbx), %rdx
 	movq	120(%rbx), %rax
 	movq	128(%rbx), %rcx
-.LBB7_44:
+.LBB7_40:
 	movq	72(%rbx), %rsi
 	imulq	$88, %rdx, %rdi
 	movq	$1, (%rsi,%rdi)
@@ -1225,7 +1206,7 @@ resource_insert:
 	movabsq	$9223372036854775807, %r8
 	incq	%r8
 	movq	%r8, 40(%rsi,%rdi)
-	leaq	.Lanon.7389e6565b10821dad2f4dd8892551e5.10(%rip), %r8
+	leaq	.Lanon.7389e6565b10821dad2f4dd8892551e5.11(%rip), %r8
 	movq	%r8, 48(%rsi,%rdi)
 	movq	$18, 56(%rsi,%rdi)
 	movq	$0, 64(%rsi,%rdi)
@@ -1238,39 +1219,39 @@ resource_insert:
 	movdqu	(%rax,%rsi), %xmm1
 	pmovmskb	%xmm1, %edx
 	testl	%edx, %edx
-	jne	.LBB7_47
+	jne	.LBB7_43
 	movl	$16, %edi
 	.p2align	4, 0x90
-.LBB7_46:
+.LBB7_42:
 	addq	%rdi, %rsi
 	andq	%rcx, %rsi
 	movdqu	(%rax,%rsi), %xmm1
 	pmovmskb	%xmm1, %edx
 	addq	$16, %rdi
 	testl	%edx, %edx
-	je	.LBB7_46
-.LBB7_47:
+	je	.LBB7_42
+.LBB7_43:
 	rep		bsfl	%edx, %edx
 	addq	%rsi, %rdx
 	andq	%rcx, %rdx
 	cmpb	$0, (%rax,%rdx)
-	js	.LBB7_49
+	js	.LBB7_45
 	movdqa	(%rax), %xmm1
 	pmovmskb	%xmm1, %edx
 	rep		bsfl	%edx, %edx
-.LBB7_49:
+.LBB7_45:
 	cmpq	$0, 136(%rbx)
-	jne	.LBB7_51
+	jne	.LBB7_47
 	testb	$1, (%rax,%rdx)
-	jne	.LBB7_53
-.LBB7_51:
+	jne	.LBB7_49
+.LBB7_47:
 	movzbl	(%rax,%rdx), %esi
 	andl	$1, %esi
 	subq	%rsi, 136(%rbx)
 	leaq	-16(%rdx), %rsi
 	andq	%rcx, %rsi
-	movb	$113, (%rax,%rdx)
-	movb	$113, 16(%rsi,%rax)
+	movb	$9, (%rax,%rdx)
+	movb	$9, 16(%rsi,%rax)
 	incq	144(%rbx)
 	negq	%rdx
 	leaq	(%rdx,%rdx,2), %rcx
@@ -1278,14 +1259,14 @@ resource_insert:
 	movq	%r14, -16(%rax,%rcx,8)
 	movq	%r13, -8(%rax,%rcx,8)
 	jmp	.LBB7_7
-.LBB7_52:
+.LBB7_48:
 	movl	$1, %esi
 	movq	%r14, %rdi
 	callq	*bevy_ecs::storage::blob_vec::BlobVec::reserve::do_reserve@GOTPCREL(%rip)
 	movq	32(%r14), %rdi
 	jmp	.LBB7_13
-.LBB7_53:
-	movd	%xmm0, 8(%rsp)
+.LBB7_49:
+	movd	%xmm0, (%rsp)
 	leaq	120(%rbx), %rdi
 	callq	hashbrown::raw::inner::RawTable<T,A>::reserve_rehash
 	movq	120(%rbx), %rax
@@ -1294,149 +1275,162 @@ resource_insert:
 	movdqu	(%rax,%r12), %xmm0
 	pmovmskb	%xmm0, %edx
 	testl	%edx, %edx
-	jne	.LBB7_56
+	jne	.LBB7_52
 	movl	$16, %esi
-.LBB7_55:
+.LBB7_51:
 	addq	%rsi, %r12
 	andq	%rcx, %r12
 	movdqu	(%rax,%r12), %xmm0
 	pmovmskb	%xmm0, %edx
 	addq	$16, %rsi
 	testl	%edx, %edx
-	je	.LBB7_55
-.LBB7_56:
-	movd	8(%rsp), %xmm0
+	je	.LBB7_51
+.LBB7_52:
+	movd	(%rsp), %xmm0
 	rep		bsfl	%edx, %edx
 	addq	%r12, %rdx
 	andq	%rcx, %rdx
 	cmpb	$0, (%rax,%rdx)
-	js	.LBB7_51
+	js	.LBB7_47
 	movdqa	(%rax), %xmm1
 	pmovmskb	%xmm1, %edx
 	rep		bsfl	%edx, %edx
-	jmp	.LBB7_51
-.LBB7_58:
+	jmp	.LBB7_47
+.LBB7_54:
 .Ltmp5:
-	leaq	.Lanon.7389e6565b10821dad2f4dd8892551e5.2(%rip), %rdx
-	movq	%r12, %rdi
+	leaq	.Lanon.7389e6565b10821dad2f4dd8892551e5.4(%rip), %rdx
+	movq	%r13, %rdi
 	movq	%r15, %rsi
 	callq	*core::panicking::panic_bounds_check@GOTPCREL(%rip)
 .Ltmp6:
-	ud2
-.LBB7_60:
-	leaq	.Lanon.7389e6565b10821dad2f4dd8892551e5.3(%rip), %rdi
-	leaq	.Lanon.7389e6565b10821dad2f4dd8892551e5.5(%rip), %rdx
+	jmp	.LBB7_58
+.LBB7_55:
+	leaq	.Lanon.7389e6565b10821dad2f4dd8892551e5.1(%rip), %rdi
+	leaq	.Lanon.7389e6565b10821dad2f4dd8892551e5.6(%rip), %rdx
 	movl	$43, %esi
 	callq	*core::panicking::panic@GOTPCREL(%rip)
-.LBB7_61:
+.LBB7_56:
 	movups	48(%r14), %xmm0
 	movups	%xmm0, 128(%rsp)
 	leaq	128(%rsp), %rax
 	movq	%rax, 232(%rsp)
 	leaq	<&T as core::fmt::Display>::fmt(%rip), %rax
 	movq	%rax, 240(%rsp)
-	leaq	.Lanon.7389e6565b10821dad2f4dd8892551e5.8(%rip), %rax
-	movq	%rax, 32(%rsp)
-	movq	$2, 40(%rsp)
-	movq	$0, 64(%rsp)
+	leaq	.Lanon.7389e6565b10821dad2f4dd8892551e5.9(%rip), %rax
+	movq	%rax, 16(%rsp)
+	movq	$2, 24(%rsp)
+	movq	$0, 48(%rsp)
 	leaq	232(%rsp), %rax
-	movq	%rax, 48(%rsp)
-	movq	$1, 56(%rsp)
-	leaq	.Lanon.7389e6565b10821dad2f4dd8892551e5.9(%rip), %rsi
-	leaq	32(%rsp), %rdi
+	movq	%rax, 32(%rsp)
+	movq	$1, 40(%rsp)
+	leaq	.Lanon.7389e6565b10821dad2f4dd8892551e5.10(%rip), %rsi
+	leaq	16(%rsp), %rdi
 	callq	*core::panicking::panic_fmt@GOTPCREL(%rip)
-.LBB7_62:
+.LBB7_57:
+.Ltmp18:
+	leaq	.Lanon.7389e6565b10821dad2f4dd8892551e5.1(%rip), %rdi
+	leaq	.Lanon.7389e6565b10821dad2f4dd8892551e5.3(%rip), %rdx
+	movl	$43, %esi
+	callq	*core::panicking::panic@GOTPCREL(%rip)
+.Ltmp19:
+.LBB7_58:
+	ud2
+.LBB7_59:
 	callq	*alloc::raw_vec::capacity_overflow@GOTPCREL(%rip)
-.LBB7_63:
+.LBB7_60:
 	movl	$1, %edi
 	movq	%r12, %rsi
 	callq	*alloc::alloc::handle_alloc_error@GOTPCREL(%rip)
-.LBB7_64:
-.Ltmp17:
+.LBB7_61:
+.Ltmp12:
 	movq	%rax, %rbx
-	cmpq	$0, 64(%rsp)
-	je	.LBB7_68
+	cmpq	$0, 48(%rsp)
+	je	.LBB7_65
 	movq	std::panicking::panic_count::GLOBAL_PANIC_COUNT@GOTPCREL(%rip), %rax
 	movq	(%rax), %rax
 	shlq	%rax
 	testq	%rax, %rax
-	je	.LBB7_68
-.Ltmp18:
+	je	.LBB7_65
+.Ltmp13:
 	callq	*std::panicking::panic_count::is_zero_slow_path@GOTPCREL(%rip)
-.Ltmp19:
+.Ltmp14:
 	testb	%al, %al
-	je	.LBB7_69
-.LBB7_68:
-.Ltmp20:
-	leaq	32(%rsp), %rdi
+	je	.LBB7_66
+.LBB7_65:
+.Ltmp15:
+	leaq	16(%rsp), %rdi
 	callq	*<bevy_ecs::storage::blob_vec::BlobVec as core::ops::drop::Drop>::drop@GOTPCREL(%rip)
-.Ltmp21:
-.LBB7_69:
-	movq	80(%rsp), %rsi
+.Ltmp16:
+.LBB7_66:
+	movq	64(%rsp), %rsi
 	testq	%rsi, %rsi
-	je	.LBB7_82
-	movq	88(%rsp), %rdi
-	jmp	.LBB7_80
-.LBB7_71:
-.Ltmp22:
-	movq	80(%rsp), %rsi
+	je	.LBB7_81
+	movq	72(%rsp), %rdi
+	jmp	.LBB7_79
+.LBB7_68:
+.Ltmp17:
+	movq	64(%rsp), %rsi
 	testq	%rsi, %rsi
-	je	.LBB7_88
-	movq	88(%rsp), %rdi
-	jmp	.LBB7_87
-.LBB7_73:
+	je	.LBB7_87
+	movq	72(%rsp), %rdi
+	jmp	.LBB7_86
+.LBB7_70:
+.Ltmp9:
+	jmp	.LBB7_74
+.LBB7_71:
 .Ltmp2:
 	movq	%rax, %rbx
 	testq	%r12, %r12
-	je	.LBB7_82
+	je	.LBB7_81
 	movl	$1, %edx
 	movq	%r13, %rdi
 	movq	%r12, %rsi
-	jmp	.LBB7_81
-.LBB7_75:
-.Ltmp9:
+	jmp	.LBB7_80
+.LBB7_73:
+.Ltmp20:
+.LBB7_74:
 	movq	%rax, %rbx
 	cmpq	$0, 160(%rsp)
-	je	.LBB7_77
+	je	.LBB7_76
 	movq	std::panicking::panic_count::GLOBAL_PANIC_COUNT@GOTPCREL(%rip), %rax
 	movq	(%rax), %rax
 	shlq	%rax
 	testq	%rax, %rax
-	jne	.LBB7_83
-.LBB7_77:
-.Ltmp12:
+	jne	.LBB7_82
+.LBB7_76:
+.Ltmp23:
 	leaq	128(%rsp), %rdi
 	callq	*<bevy_ecs::storage::blob_vec::BlobVec as core::ops::drop::Drop>::drop@GOTPCREL(%rip)
-.Ltmp13:
-.LBB7_78:
+.Ltmp24:
+.LBB7_77:
 	movq	176(%rsp), %rsi
 	testq	%rsi, %rsi
-	je	.LBB7_82
+	je	.LBB7_81
 	movq	184(%rsp), %rdi
-.LBB7_80:
+.LBB7_79:
 	movl	$1, %edx
-.LBB7_81:
+.LBB7_80:
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB7_82:
+.LBB7_81:
 	movq	%rbx, %rdi
 	callq	_Unwind_Resume@PLT
-.LBB7_83:
-.Ltmp10:
+.LBB7_82:
+.Ltmp21:
 	callq	*std::panicking::panic_count::is_zero_slow_path@GOTPCREL(%rip)
-.Ltmp11:
+.Ltmp22:
 	testb	%al, %al
-	jne	.LBB7_77
-	jmp	.LBB7_78
-.LBB7_85:
-.Ltmp14:
+	jne	.LBB7_76
+	jmp	.LBB7_77
+.LBB7_84:
+.Ltmp25:
 	movq	176(%rsp), %rsi
 	testq	%rsi, %rsi
-	je	.LBB7_88
+	je	.LBB7_87
 	movq	184(%rsp), %rdi
-.LBB7_87:
+.LBB7_86:
 	movl	$1, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB7_88:
+.LBB7_87:
 	callq	*core::panicking::panic_in_cleanup@GOTPCREL(%rip)
 .Lfunc_end7:
 	.size	resource_insert, .Lfunc_end7-resource_insert
@@ -1461,40 +1455,56 @@ GCC_except_table7:
 	.uleb128 .Ltmp2-.Lfunc_begin0
 	.byte	0
 	.uleb128 .Ltmp3-.Lfunc_begin0
-	.uleb128 .Ltmp8-.Ltmp3
+	.uleb128 .Ltmp4-.Ltmp3
+	.uleb128 .Ltmp20-.Lfunc_begin0
+	.byte	0
+	.uleb128 .Ltmp4-.Lfunc_begin0
+	.uleb128 .Ltmp7-.Ltmp4
+	.byte	0
+	.byte	0
+	.uleb128 .Ltmp7-.Lfunc_begin0
+	.uleb128 .Ltmp8-.Ltmp7
 	.uleb128 .Ltmp9-.Lfunc_begin0
 	.byte	0
-	.uleb128 .Ltmp15-.Lfunc_begin0
-	.uleb128 .Ltmp16-.Ltmp15
-	.uleb128 .Ltmp17-.Lfunc_begin0
+	.uleb128 .Ltmp10-.Lfunc_begin0
+	.uleb128 .Ltmp11-.Ltmp10
+	.uleb128 .Ltmp12-.Lfunc_begin0
 	.byte	0
-	.uleb128 .Ltmp16-.Lfunc_begin0
-	.uleb128 .Ltmp5-.Ltmp16
+	.uleb128 .Ltmp11-.Lfunc_begin0
+	.uleb128 .Ltmp5-.Ltmp11
 	.byte	0
 	.byte	0
 	.uleb128 .Ltmp5-.Lfunc_begin0
 	.uleb128 .Ltmp6-.Ltmp5
-	.uleb128 .Ltmp9-.Lfunc_begin0
+	.uleb128 .Ltmp20-.Lfunc_begin0
 	.byte	0
 	.uleb128 .Ltmp6-.Lfunc_begin0
 	.uleb128 .Ltmp18-.Ltmp6
 	.byte	0
 	.byte	0
 	.uleb128 .Ltmp18-.Lfunc_begin0
-	.uleb128 .Ltmp21-.Ltmp18
-	.uleb128 .Ltmp22-.Lfunc_begin0
+	.uleb128 .Ltmp19-.Ltmp18
+	.uleb128 .Ltmp20-.Lfunc_begin0
+	.byte	0
+	.uleb128 .Ltmp19-.Lfunc_begin0
+	.uleb128 .Ltmp13-.Ltmp19
+	.byte	0
+	.byte	0
+	.uleb128 .Ltmp13-.Lfunc_begin0
+	.uleb128 .Ltmp16-.Ltmp13
+	.uleb128 .Ltmp17-.Lfunc_begin0
 	.byte	1
-	.uleb128 .Ltmp12-.Lfunc_begin0
-	.uleb128 .Ltmp13-.Ltmp12
-	.uleb128 .Ltmp14-.Lfunc_begin0
+	.uleb128 .Ltmp23-.Lfunc_begin0
+	.uleb128 .Ltmp24-.Ltmp23
+	.uleb128 .Ltmp25-.Lfunc_begin0
 	.byte	1
-	.uleb128 .Ltmp13-.Lfunc_begin0
-	.uleb128 .Ltmp10-.Ltmp13
+	.uleb128 .Ltmp24-.Lfunc_begin0
+	.uleb128 .Ltmp21-.Ltmp24
 	.byte	0
 	.byte	0
-	.uleb128 .Ltmp10-.Lfunc_begin0
-	.uleb128 .Ltmp11-.Ltmp10
-	.uleb128 .Ltmp14-.Lfunc_begin0
+	.uleb128 .Ltmp21-.Lfunc_begin0
+	.uleb128 .Ltmp22-.Ltmp21
+	.uleb128 .Ltmp25-.Lfunc_begin0
 	.byte	1
 .Lcst_end0:
 	.byte	127
@@ -1513,100 +1523,108 @@ GCC_except_table7:
 	.type	.Lanon.7389e6565b10821dad2f4dd8892551e5.1,@object
 	.section	.rodata..Lanon.7389e6565b10821dad2f4dd8892551e5.1,"a",@progbits
 .Lanon.7389e6565b10821dad2f4dd8892551e5.1:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/2701188/crates/bevy_ecs/src/storage/sparse_set.rs"
-	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.1, 104
+	.ascii	"called `Option::unwrap()` on a `None` value"
+	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.1, 43
 
 	.type	.Lanon.7389e6565b10821dad2f4dd8892551e5.2,@object
-	.section	.data.rel.ro..Lanon.7389e6565b10821dad2f4dd8892551e5.2,"aw",@progbits
-	.p2align	3, 0x0
+	.section	.rodata..Lanon.7389e6565b10821dad2f4dd8892551e5.2,"a",@progbits
 .Lanon.7389e6565b10821dad2f4dd8892551e5.2:
-	.quad	.Lanon.7389e6565b10821dad2f4dd8892551e5.1
-	.asciz	"h\000\000\000\000\000\000\000L\000\000\000\024\000\000"
-	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.2, 24
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-11a63d9ba653d13e/56a7685/crates/bevy_ecs/src/storage/sparse_set.rs"
+	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.2, 104
 
 	.type	.Lanon.7389e6565b10821dad2f4dd8892551e5.3,@object
-	.section	.rodata..Lanon.7389e6565b10821dad2f4dd8892551e5.3,"a",@progbits
+	.section	.data.rel.ro..Lanon.7389e6565b10821dad2f4dd8892551e5.3,"aw",@progbits
+	.p2align	3, 0x0
 .Lanon.7389e6565b10821dad2f4dd8892551e5.3:
-	.ascii	"called `Option::unwrap()` on a `None` value"
-	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.3, 43
+	.quad	.Lanon.7389e6565b10821dad2f4dd8892551e5.2
+	.asciz	"h\000\000\000\000\000\000\000\334\001\000\000M\000\000"
+	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.3, 24
 
 	.type	.Lanon.7389e6565b10821dad2f4dd8892551e5.4,@object
-	.section	.rodata..Lanon.7389e6565b10821dad2f4dd8892551e5.4,"a",@progbits
+	.section	.data.rel.ro..Lanon.7389e6565b10821dad2f4dd8892551e5.4,"aw",@progbits
+	.p2align	3, 0x0
 .Lanon.7389e6565b10821dad2f4dd8892551e5.4:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/2701188/crates/bevy_ecs/src/storage/resource.rs"
-	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.4, 102
+	.quad	.Lanon.7389e6565b10821dad2f4dd8892551e5.2
+	.asciz	"h\000\000\000\000\000\000\000M\000\000\000\024\000\000"
+	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.4, 24
 
 	.type	.Lanon.7389e6565b10821dad2f4dd8892551e5.5,@object
-	.section	.data.rel.ro..Lanon.7389e6565b10821dad2f4dd8892551e5.5,"aw",@progbits
-	.p2align	3, 0x0
+	.section	.rodata..Lanon.7389e6565b10821dad2f4dd8892551e5.5,"a",@progbits
 .Lanon.7389e6565b10821dad2f4dd8892551e5.5:
-	.quad	.Lanon.7389e6565b10821dad2f4dd8892551e5.4
-	.asciz	"f\000\000\000\000\000\000\0009\001\000\000D\000\000"
-	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.5, 24
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-11a63d9ba653d13e/56a7685/crates/bevy_ecs/src/storage/resource.rs"
+	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.5, 102
 
 	.type	.Lanon.7389e6565b10821dad2f4dd8892551e5.6,@object
-	.section	.rodata..Lanon.7389e6565b10821dad2f4dd8892551e5.6,"a",@progbits
+	.section	.data.rel.ro..Lanon.7389e6565b10821dad2f4dd8892551e5.6,"aw",@progbits
+	.p2align	3, 0x0
 .Lanon.7389e6565b10821dad2f4dd8892551e5.6:
-	.ascii	"Send + Sync resource "
-	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.6, 21
+	.quad	.Lanon.7389e6565b10821dad2f4dd8892551e5.5
+	.asciz	"f\000\000\000\000\000\000\0009\001\000\000D\000\000"
+	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.6, 24
 
 	.type	.Lanon.7389e6565b10821dad2f4dd8892551e5.7,@object
 	.section	.rodata..Lanon.7389e6565b10821dad2f4dd8892551e5.7,"a",@progbits
 .Lanon.7389e6565b10821dad2f4dd8892551e5.7:
-	.ascii	" initialized as non_send. It may have been inserted via World::insert_non_send_resource by accident. Try using World::insert_resource instead."
-	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.7, 142
+	.ascii	"Send + Sync resource "
+	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.7, 21
 
 	.type	.Lanon.7389e6565b10821dad2f4dd8892551e5.8,@object
-	.section	.data.rel.ro..Lanon.7389e6565b10821dad2f4dd8892551e5.8,"aw",@progbits
-	.p2align	3, 0x0
+	.section	.rodata..Lanon.7389e6565b10821dad2f4dd8892551e5.8,"a",@progbits
 .Lanon.7389e6565b10821dad2f4dd8892551e5.8:
-	.quad	.Lanon.7389e6565b10821dad2f4dd8892551e5.6
-	.asciz	"\025\000\000\000\000\000\000"
-	.quad	.Lanon.7389e6565b10821dad2f4dd8892551e5.7
-	.asciz	"\216\000\000\000\000\000\000"
-	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.8, 32
+	.ascii	" initialized as non_send. It may have been inserted via World::insert_non_send_resource by accident. Try using World::insert_resource instead."
+	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.8, 142
 
 	.type	.Lanon.7389e6565b10821dad2f4dd8892551e5.9,@object
 	.section	.data.rel.ro..Lanon.7389e6565b10821dad2f4dd8892551e5.9,"aw",@progbits
 	.p2align	3, 0x0
 .Lanon.7389e6565b10821dad2f4dd8892551e5.9:
-	.quad	.Lanon.7389e6565b10821dad2f4dd8892551e5.4
-	.asciz	"f\000\000\000\000\000\000\000;\001\000\000\021\000\000"
-	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.9, 24
+	.quad	.Lanon.7389e6565b10821dad2f4dd8892551e5.7
+	.asciz	"\025\000\000\000\000\000\000"
+	.quad	.Lanon.7389e6565b10821dad2f4dd8892551e5.8
+	.asciz	"\216\000\000\000\000\000\000"
+	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.9, 32
 
 	.type	.Lanon.7389e6565b10821dad2f4dd8892551e5.10,@object
-	.section	.rodata..Lanon.7389e6565b10821dad2f4dd8892551e5.10,"a",@progbits
+	.section	.data.rel.ro..Lanon.7389e6565b10821dad2f4dd8892551e5.10,"aw",@progbits
+	.p2align	3, 0x0
 .Lanon.7389e6565b10821dad2f4dd8892551e5.10:
-	.ascii	"resource_insert::A"
-	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.10, 18
+	.quad	.Lanon.7389e6565b10821dad2f4dd8892551e5.5
+	.asciz	"f\000\000\000\000\000\000\000;\001\000\000\021\000\000"
+	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.10, 24
 
 	.type	.Lanon.7389e6565b10821dad2f4dd8892551e5.11,@object
 	.section	.rodata..Lanon.7389e6565b10821dad2f4dd8892551e5.11,"a",@progbits
 .Lanon.7389e6565b10821dad2f4dd8892551e5.11:
-	.ascii	"Hash table capacity overflow"
-	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.11, 28
+	.ascii	"resource_insert::A"
+	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.11, 18
 
 	.type	.Lanon.7389e6565b10821dad2f4dd8892551e5.12,@object
-	.section	.data.rel.ro..Lanon.7389e6565b10821dad2f4dd8892551e5.12,"aw",@progbits
-	.p2align	3, 0x0
+	.section	.rodata..Lanon.7389e6565b10821dad2f4dd8892551e5.12,"a",@progbits
 .Lanon.7389e6565b10821dad2f4dd8892551e5.12:
-	.quad	.Lanon.7389e6565b10821dad2f4dd8892551e5.11
-	.asciz	"\034\000\000\000\000\000\000"
-	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.12, 16
+	.ascii	"Hash table capacity overflow"
+	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.12, 28
 
 	.type	.Lanon.7389e6565b10821dad2f4dd8892551e5.13,@object
-	.section	.rodata..Lanon.7389e6565b10821dad2f4dd8892551e5.13,"a",@progbits
+	.section	.data.rel.ro..Lanon.7389e6565b10821dad2f4dd8892551e5.13,"aw",@progbits
+	.p2align	3, 0x0
 .Lanon.7389e6565b10821dad2f4dd8892551e5.13:
-	.ascii	"/home/james/.cargo/registry/src/index.crates.io-6f17d22bba15001f/hashbrown-0.14.3/src/raw/mod.rs"
-	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.13, 96
+	.quad	.Lanon.7389e6565b10821dad2f4dd8892551e5.12
+	.asciz	"\034\000\000\000\000\000\000"
+	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.13, 16
 
 	.type	.Lanon.7389e6565b10821dad2f4dd8892551e5.14,@object
-	.section	.data.rel.ro..Lanon.7389e6565b10821dad2f4dd8892551e5.14,"aw",@progbits
-	.p2align	3, 0x0
+	.section	.rodata..Lanon.7389e6565b10821dad2f4dd8892551e5.14,"a",@progbits
 .Lanon.7389e6565b10821dad2f4dd8892551e5.14:
-	.quad	.Lanon.7389e6565b10821dad2f4dd8892551e5.13
+	.ascii	"/home/james/.cargo/registry/src/index.crates.io-6f17d22bba15001f/hashbrown-0.14.3/src/raw/mod.rs"
+	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.14, 96
+
+	.type	.Lanon.7389e6565b10821dad2f4dd8892551e5.15,@object
+	.section	.data.rel.ro..Lanon.7389e6565b10821dad2f4dd8892551e5.15,"aw",@progbits
+	.p2align	3, 0x0
+.Lanon.7389e6565b10821dad2f4dd8892551e5.15:
+	.quad	.Lanon.7389e6565b10821dad2f4dd8892551e5.14
 	.asciz	"`\000\000\000\000\000\000\000V\000\000\000(\000\000"
-	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.14, 24
+	.size	.Lanon.7389e6565b10821dad2f4dd8892551e5.15, 24
 
 	.hidden	DW.ref.rust_eh_personality
 	.weak	DW.ref.rust_eh_personality
diff --git a/results/resource_remove.s b/results/resource_remove.s
index 0aaac59..befab62 100644
--- a/results/resource_remove.s
+++ b/results/resource_remove.s
@@ -1,26 +1,26 @@
 	.text
-	.file	"resource_remove.fe56fd7925fc8b6f-cgu.0"
+	.file	"resource_remove.736ca48b66f8f8e7-cgu.0"
 	.section	.rodata.cst16,"aM",@progbits,16
 	.p2align	4, 0x0
 .LCPI0_0:
-	.zero	16,98
+	.zero	16,71
 .LCPI0_1:
-	.byte	244
-	.byte	102
-	.byte	243
-	.byte	146
 	.byte	72
-	.byte	85
-	.byte	89
-	.byte	197
-	.byte	89
-	.byte	45
-	.byte	88
-	.byte	89
-	.byte	6
-	.byte	129
-	.byte	200
-	.byte	87
+	.byte	202
+	.byte	161
+	.byte	229
+	.byte	148
+	.byte	111
+	.byte	90
+	.byte	142
+	.byte	226
+	.byte	219
+	.byte	164
+	.byte	43
+	.byte	149
+	.byte	33
+	.byte	244
+	.byte	53
 	.section	.text.resource_insert,"ax",@progbits
 	.globl	resource_insert
 	.p2align	4, 0x90
@@ -35,7 +35,7 @@ resource_insert:
 	movq	120(%rdi), %rax
 	movq	128(%rdi), %rcx
 	leaq	-24(%rax), %rdx
-	movabsq	$-4226253005119068428, %rsi
+	movabsq	$-8189110287121397176, %rsi
 	xorl	%r8d, %r8d
 	movdqa	.LCPI0_0(%rip), %xmm0
 	pcmpeqd	%xmm1, %xmm1
@@ -75,18 +75,18 @@ resource_insert:
 	addq	$16, %r8
 	jmp	.LBB0_2
 .LBB0_7:
-	movq	-8(%rax,%r10,8), %rdx
+	movq	-8(%rax,%r10,8), %rcx
 	xorl	%eax, %eax
-	cmpq	%rdx, 408(%rdi)
+	cmpq	%rcx, 408(%rdi)
 	jbe	.LBB0_19
-	movq	400(%rdi), %rsi
-	testq	%rsi, %rsi
+	movq	400(%rdi), %rdx
+	testq	%rdx, %rdx
 	je	.LBB0_19
-	shlq	$4, %rdx
-	cmpq	$0, (%rsi,%rdx)
+	movq	(%rdx,%rcx,8), %rdx
+	testq	%rdx, %rdx
 	je	.LBB0_19
 	movq	352(%rdi), %rcx
-	movq	8(%rsi,%rdx), %rdx
+	notq	%rdx
 	leaq	(%rdx,%rdx,2), %rdx
 	shlq	$5, %rdx
 	movq	32(%rcx,%rdx), %rsi
diff --git a/results/world_get.s b/results/world_get.s
index 437ce69..400a9ac 100644
--- a/results/world_get.s
+++ b/results/world_get.s
@@ -1,26 +1,26 @@
 	.text
-	.file	"world_get.421e65fb7169e603-cgu.0"
+	.file	"world_get.a5f98468d62accb2-cgu.0"
 	.section	.rodata.cst16,"aM",@progbits,16
 	.p2align	4, 0x0
 .LCPI0_0:
-	.zero	16,61
+	.zero	16,90
 .LCPI0_1:
-	.byte	134
-	.byte	12
-	.byte	222
-	.byte	35
-	.byte	51
-	.byte	10
-	.byte	114
-	.byte	123
-	.byte	241
-	.byte	133
-	.byte	234
-	.byte	26
-	.byte	97
-	.byte	2
-	.byte	25
-	.byte	110
+	.byte	137
+	.byte	168
+	.byte	229
+	.byte	173
+	.byte	81
+	.byte	190
+	.byte	70
+	.byte	181
+	.byte	200
+	.byte	145
+	.byte	63
+	.byte	250
+	.byte	105
+	.byte	1
+	.byte	47
+	.byte	203
 	.section	.text.world_get,"ax",@progbits
 	.globl	world_get
 	.p2align	4, 0x90
@@ -70,7 +70,7 @@ world_get:
 	movq	88(%rdi), %r9
 	movq	96(%rdi), %r10
 	leaq	-24(%r9), %r11
-	movabsq	$8895183428771515526, %rbx
+	movabsq	$-5384407046455711607, %rbx
 	xorl	%esi, %esi
 	movdqa	.LCPI0_0(%rip), %xmm0
 	pcmpeqd	%xmm1, %xmm1
@@ -113,22 +113,22 @@ world_get:
 	movq	304(%rdi), %rsi
 	cmpq	%rax, %rsi
 	jbe	.LBB0_20
-	movq	-8(%r9,%r12,8), %r9
+	movq	-8(%r9,%r12,8), %r10
 	movq	296(%rdi), %rdi
-	leaq	(%rax,%rax,8), %r10
+	leaq	(%rax,%rax,8), %r9
 	xorl	%esi, %esi
-	cmpq	%r9, 64(%rdi,%r10,8)
+	cmpq	%r10, 64(%rdi,%r9,8)
 	jbe	.LBB0_17
-	movq	56(%rdi,%r10,8), %r11
+	movq	56(%rdi,%r9,8), %r11
 	testq	%r11, %r11
 	je	.LBB0_18
-	shlq	$4, %r9
-	cmpq	$0, (%r11,%r9)
+	movq	(%r11,%r10,8), %rax
+	testq	%rax, %rax
 	je	.LBB0_16
-	leaq	(%rdi,%r10,8), %rax
-	addq	$24, %rax
-	movq	(%rax), %rdi
-	movq	8(%r11,%r9), %rax
+	leaq	(%rdi,%r9,8), %rsi
+	addq	$24, %rsi
+	movq	(%rsi), %rdi
+	notq	%rax
 	leaq	(%rax,%rax,2), %r9
 	shlq	$5, %r9
 	movq	8(%rdi,%r9), %rsi
@@ -178,7 +178,7 @@ world_get:
 	.type	.Lanon.155300dae0580fe2c3564be8a13f3f51.0,@object
 	.section	.rodata..Lanon.155300dae0580fe2c3564be8a13f3f51.0,"a",@progbits
 .Lanon.155300dae0580fe2c3564be8a13f3f51.0:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/2701188/crates/bevy_ecs/src/world/unsafe_world_cell.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-11a63d9ba653d13e/56a7685/crates/bevy_ecs/src/world/unsafe_world_cell.rs"
 	.size	.Lanon.155300dae0580fe2c3564be8a13f3f51.0, 109
 
 	.type	.Lanon.155300dae0580fe2c3564be8a13f3f51.1,@object
diff --git a/results/world_get_sparse.s b/results/world_get_sparse.s
index 24ba096..0034d03 100644
--- a/results/world_get_sparse.s
+++ b/results/world_get_sparse.s
@@ -1,26 +1,26 @@
 	.text
-	.file	"world_get_sparse.ae9e40302931d87-cgu.0"
+	.file	"world_get_sparse.437a40b839b49f84-cgu.0"
 	.section	.rodata.cst16,"aM",@progbits,16
 	.p2align	4, 0x0
 .LCPI0_0:
-	.zero	16,20
+	.zero	16,38
 .LCPI0_1:
-	.byte	224
-	.byte	62
-	.byte	50
-	.byte	1
-	.byte	44
-	.byte	176
-	.byte	205
-	.byte	41
-	.byte	139
-	.byte	43
-	.byte	246
-	.byte	10
-	.byte	95
-	.byte	225
-	.byte	114
-	.byte	145
+	.byte	54
+	.byte	248
+	.byte	239
+	.byte	144
+	.byte	0
+	.byte	66
+	.byte	187
+	.byte	76
+	.byte	64
+	.byte	66
+	.byte	155
+	.byte	192
+	.byte	253
+	.byte	113
+	.byte	242
+	.byte	16
 	.section	.text.world_get,"ax",@progbits
 	.globl	world_get
 	.p2align	4, 0x90
@@ -62,7 +62,7 @@ world_get:
 	movq	88(%rdi), %rsi
 	movq	96(%rdi), %r9
 	leaq	-24(%rsi), %r10
-	movabsq	$3012257428825849568, %r11
+	movabsq	$5529085537726494774, %r11
 	xorl	%edx, %edx
 	movdqa	.LCPI0_0(%rip), %xmm0
 	pcmpeqd	%xmm1, %xmm1
@@ -109,11 +109,11 @@ world_get:
 	movq	272(%rdi), %r11
 	testq	%r11, %r11
 	je	.LBB0_20
-	shlq	$4, %r10
-	cmpq	$0, (%r11,%r10)
+	movq	(%r11,%r10,8), %rdx
+	testq	%rdx, %rdx
 	je	.LBB0_18
 	movq	224(%rdi), %rdi
-	movq	8(%r11,%r10), %rdx
+	notq	%rdx
 	leaq	(%rdx,%rdx,8), %r10
 	shlq	$4, %r10
 	xorl	%edx, %edx
diff --git a/results/world_insert_or_spawn_batch.s b/results/world_insert_or_spawn_batch.s
index 51496d7..02708e5 100644
--- a/results/world_insert_or_spawn_batch.s
+++ b/results/world_insert_or_spawn_batch.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"world_insert_or_spawn_batch.f675c1013f16fe8f-cgu.0"
+	.file	"world_insert_or_spawn_batch.31fe802e81e7f535-cgu.0"
 	.section	.text.alloc::raw_vec::finish_grow,"ax",@progbits
 	.p2align	4, 0x90
 	.type	alloc::raw_vec::finish_grow,@function
@@ -96,14 +96,15 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	cmovaeq	%rsi, %r14
 	xorl	%esi, %esi
 	movq	%r14, %rcx
-	shrq	$60, %rcx
+	shrq	$58, %rcx
 	sete	%sil
-	leaq	(,%r14,8), %rdx
+	movq	%r14, %rdx
+	shlq	$5, %rdx
 	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB1_2
 	movq	8(%rbx), %rcx
-	shlq	$3, %rax
+	shlq	$5, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -254,17 +255,16 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	cmpq	$5, %rsi
 	movl	$4, %r14d
 	cmovaeq	%rsi, %r14
+	movabsq	$104811045873349726, %rcx
 	xorl	%esi, %esi
-	movq	%r14, %rcx
-	shrq	$58, %rcx
-	sete	%sil
-	movq	%r14, %rdx
-	shlq	$5, %rdx
+	cmpq	%rcx, %r14
+	setb	%sil
+	imulq	$88, %r14, %rdx
 	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB3_2
 	movq	8(%rbx), %rcx
-	shlq	$5, %rax
+	imulq	$88, %rax, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -337,15 +337,14 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	cmovaeq	%rsi, %r14
 	xorl	%esi, %esi
 	movq	%r14, %rcx
-	shrq	$59, %rcx
+	shrq	$60, %rcx
 	sete	%sil
-	movq	%r14, %rdx
-	shlq	$4, %rdx
+	leaq	(,%r14,8), %rdx
 	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB4_2
 	movq	8(%rbx), %rcx
-	shlq	$4, %rax
+	shlq	$3, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -416,16 +415,17 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	cmpq	$5, %rsi
 	movl	$4, %r14d
 	cmovaeq	%rsi, %r14
-	movabsq	$104811045873349726, %rcx
 	xorl	%esi, %esi
-	cmpq	%rcx, %r14
-	setb	%sil
-	imulq	$88, %r14, %rdx
+	movq	%r14, %rcx
+	shrq	$59, %rcx
+	sete	%sil
+	movq	%r14, %rdx
+	shlq	$4, %rdx
 	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB5_2
 	movq	8(%rbx), %rcx
-	imulq	$88, %rax, %rax
+	shlq	$4, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -578,10 +578,10 @@ bevy_ecs::bundle::BundleInserter::insert:
 	movq	56(%rbp), %rcx
 	testq	%rcx, %rcx
 	je	.LBB6_12
-	shlq	$4, %rax
-	cmpq	$0, (%rcx,%rax)
+	movq	(%rcx,%rax,8), %rax
+	testq	%rax, %rax
 	je	.LBB6_10
-	movq	8(%rcx,%rax), %rax
+	notq	%rax
 	leaq	(%rax,%rax,2), %r14
 	shlq	$5, %r14
 	addq	24(%rbp), %r14
@@ -665,10 +665,10 @@ bevy_ecs::bundle::BundleInserter::insert:
 	movq	56(%rbp), %rcx
 	testq	%rcx, %rcx
 	je	.LBB6_20
-	shlq	$4, %rax
-	cmpq	$0, (%rcx,%rax)
+	movq	(%rcx,%rax,8), %rax
+	testq	%rax, %rax
 	je	.LBB6_18
-	movq	8(%rcx,%rax), %rax
+	notq	%rax
 	leaq	(%rax,%rax,2), %r14
 	shlq	$5, %r14
 	addq	24(%rbp), %r14
@@ -774,10 +774,10 @@ bevy_ecs::bundle::BundleInserter::insert:
 	movq	56(%rbp), %rcx
 	testq	%rcx, %rcx
 	je	.LBB6_53
-	shlq	$4, %rax
-	cmpq	$0, (%rcx,%rax)
+	movq	(%rcx,%rax,8), %rax
+	testq	%rax, %rax
 	je	.LBB6_51
-	movq	8(%rcx,%rax), %rax
+	notq	%rax
 	leaq	(%rax,%rax,2), %rbx
 	shlq	$5, %rbx
 	addq	24(%rbp), %rbx
@@ -819,10 +819,10 @@ bevy_ecs::bundle::BundleInserter::insert:
 	testq	%rcx, %rcx
 	movq	48(%rsp), %r12
 	je	.LBB6_62
-	shlq	$4, %rax
-	cmpq	$0, (%rcx,%rax)
+	movq	(%rcx,%rax,8), %rax
+	testq	%rax, %rax
 	je	.LBB6_60
-	movq	8(%rcx,%rax), %rax
+	notq	%rax
 	leaq	(%rax,%rax,2), %rbx
 	shlq	$5, %rbx
 	addq	24(%rbp), %rbx
@@ -977,10 +977,10 @@ bevy_ecs::bundle::BundleInserter::insert:
 	movq	56(%rdx), %rcx
 	testq	%rcx, %rcx
 	je	.LBB6_86
-	shlq	$4, %rax
-	cmpq	$0, (%rcx,%rax)
+	movq	(%rcx,%rax,8), %rax
+	testq	%rax, %rax
 	je	.LBB6_84
-	movq	8(%rcx,%rax), %rax
+	notq	%rax
 	leaq	(%rax,%rax,2), %rbx
 	shlq	$5, %rbx
 	addq	24(%rdx), %rbx
@@ -1022,10 +1022,10 @@ bevy_ecs::bundle::BundleInserter::insert:
 	movq	56(%rdx), %rcx
 	testq	%rcx, %rcx
 	je	.LBB6_94
-	shlq	$4, %rax
-	cmpq	$0, (%rcx,%rax)
+	movq	(%rcx,%rax,8), %rax
+	testq	%rax, %rax
 	je	.LBB6_92
-	movq	8(%rcx,%rax), %rax
+	notq	%rax
 	leaq	(%rax,%rax,2), %rbx
 	shlq	$5, %rbx
 	addq	24(%rdx), %rbx
@@ -2368,26 +2368,28 @@ hashbrown::raw::inner::RawTable<T,A>::reserve_rehash:
 	.section	.rodata.cst16,"aM",@progbits,16
 	.p2align	4, 0x0
 .LCPI11_0:
-	.zero	16,122
+	.zero	16,113
 .LCPI11_1:
-	.byte	191
-	.byte	68
-	.byte	1
-	.byte	132
-	.byte	49
-	.byte	171
-	.byte	205
-	.byte	245
-	.byte	61
-	.byte	239
-	.byte	169
-	.byte	28
-	.byte	255
-	.byte	30
+	.byte	85
+	.byte	251
+	.byte	144
+	.byte	222
+	.byte	174
+	.byte	153
+	.byte	147
+	.byte	227
 	.byte	96
-	.byte	98
+	.byte	91
+	.byte	79
+	.byte	148
+	.byte	243
+	.byte	50
+	.byte	229
+	.byte	17
 .LCPI11_2:
-	.zero	16,67
+	.zero	16,74
+.LCPI11_3:
+	.zero	16,14
 	.section	.text.world_insert_or_spawn_batch,"ax",@progbits
 	.globl	world_insert_or_spawn_batch
 	.p2align	4, 0x90
@@ -2430,7 +2432,7 @@ world_insert_or_spawn_batch:
 	shlq	$4, %rax
 	addq	112(%rsp), %rax
 	movq	%rax, 376(%rsp)
-	movabsq	$-734742935035099969, %rdx
+	movabsq	$-2048124429186041003, %rdx
 	movl	760(%r15), %eax
 	movl	%eax, 84(%rsp)
 	leaq	488(%r15), %rbx
@@ -2595,8 +2597,8 @@ world_insert_or_spawn_batch:
 	movq	(%rax), %rax
 	movq	24(%r14), %rdx
 	movq	56(%r14), %rcx
-	shlq	$4, %rax
-	movq	8(%rcx,%rax), %rax
+	movq	(%rcx,%rax,8), %rax
+	notq	%rax
 	leaq	(%rax,%rax,2), %r12
 	shlq	$5, %r12
 	movl	%edi, %r13d
@@ -2621,8 +2623,8 @@ world_insert_or_spawn_batch:
 	movq	8(%rax), %rax
 	movq	24(%r14), %r12
 	movq	56(%r14), %rcx
-	shlq	$4, %rax
-	movq	8(%rcx,%rax), %rax
+	movq	(%rcx,%rax,8), %rax
+	notq	%rax
 	leaq	(%rax,%rax,2), %r14
 	shlq	$5, %r14
 	movq	8(%r12,%r14), %rdx
@@ -2738,8 +2740,8 @@ world_insert_or_spawn_batch:
 	movl	%r14d, 76(%rsp)
 	movq	24(%r13), %r14
 	movq	56(%r13), %rcx
-	shlq	$4, %rax
-	movq	8(%rcx,%rax), %rax
+	movq	(%rcx,%rax,8), %rax
+	notq	%rax
 	leaq	(%rax,%rax,2), %r12
 	shlq	$5, %r12
 	movl	%edx, %r15d
@@ -2761,8 +2763,8 @@ world_insert_or_spawn_batch:
 	movq	8(%rax), %rax
 	movq	24(%r13), %r14
 	movq	56(%r13), %rcx
-	shlq	$4, %rax
-	movq	8(%rcx,%rax), %rax
+	movq	(%rcx,%rax,8), %rax
+	notq	%rax
 	leaq	(%rax,%rax,2), %r12
 	shlq	$5, %r12
 	movq	8(%r14,%r12), %rdx
@@ -2898,8 +2900,8 @@ world_insert_or_spawn_batch:
 	retq
 .LBB11_17:
 	.cfi_def_cfa_offset 480
-	movabsq	$5268508862503147817, %rax
-	movabsq	$-8699991817368610810, %rcx
+	movabsq	$-3430061460600791427, %rax
+	movabsq	$-7705950678528171775, %rcx
 	movq	$0, 24(%rsp)
 	leaq	32(%rsp), %rdx
 	movq	%rdx, 64(%rsp)
@@ -2911,15 +2913,15 @@ world_insert_or_spawn_batch:
 	movq	96(%r15), %rsi
 	leaq	-24(%rdx), %rdi
 	xorl	%r8d, %r8d
-	movdqa	.LCPI11_2(%rip), %xmm3
-	pcmpeqd	%xmm0, %xmm0
+	movdqa	.LCPI11_2(%rip), %xmm0
+	pcmpeqd	%xmm1, %xmm1
 	movq	%rcx, %r9
 .LBB11_18:
 	andq	%rsi, %r9
-	movdqu	(%rdx,%r9), %xmm1
-	movdqa	%xmm1, %xmm2
-	pcmpeqb	%xmm3, %xmm2
-	pmovmskb	%xmm2, %r10d
+	movdqu	(%rdx,%r9), %xmm2
+	movdqa	%xmm2, %xmm3
+	pcmpeqb	%xmm0, %xmm3
+	pmovmskb	%xmm3, %r10d
 	.p2align	4, 0x90
 .LBB11_19:
 	testw	%r10w, %r10w
@@ -2940,14 +2942,13 @@ world_insert_or_spawn_batch:
 	jne	.LBB11_19
 	jmp	.LBB11_23
 .LBB11_20:
-	pcmpeqb	%xmm0, %xmm1
-	pmovmskb	%xmm1, %r10d
+	pcmpeqb	%xmm1, %xmm2
+	pmovmskb	%xmm2, %r10d
 	testl	%r10d, %r10d
 	jne	.LBB11_24
 	addq	%r8, %r9
 	addq	$16, %r9
 	addq	$16, %r8
-	movdqa	.LCPI11_2(%rip), %xmm3
 	jmp	.LBB11_18
 .LBB11_23:
 	leaq	(%rdx,%r11,8), %rax
@@ -2959,8 +2960,8 @@ world_insert_or_spawn_batch:
 	xorl	%esi, %esi
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
 .Ltmp13:
-	movabsq	$3288948607451766265, %rax
-	movabsq	$-8787955757598189597, %rcx
+	movabsq	$-4173859784868832389, %rax
+	movabsq	$2113835484634131633, %rcx
 	movq	32(%rsp), %rsi
 	movq	40(%rsp), %rdx
 	movq	%rsi, 128(%rsp)
@@ -2973,14 +2974,15 @@ world_insert_or_spawn_batch:
 	movq	96(%rsi), %rsi
 	leaq	-24(%rdx), %rdi
 	xorl	%r8d, %r8d
-	pcmpeqd	%xmm0, %xmm0
+	movdqa	.LCPI11_3(%rip), %xmm0
+	pcmpeqd	%xmm1, %xmm1
 	movq	%rcx, %r9
 .LBB11_28:
 	andq	%rsi, %r9
-	movdqu	(%rdx,%r9), %xmm1
-	movdqa	%xmm1, %xmm2
-	pcmpeqb	.LCPI11_2(%rip), %xmm2
-	pmovmskb	%xmm2, %r10d
+	movdqu	(%rdx,%r9), %xmm2
+	movdqa	%xmm2, %xmm3
+	pcmpeqb	%xmm0, %xmm3
+	pmovmskb	%xmm3, %r10d
 	.p2align	4, 0x90
 .LBB11_29:
 	testw	%r10w, %r10w
@@ -3001,8 +3003,8 @@ world_insert_or_spawn_batch:
 	jne	.LBB11_29
 	jmp	.LBB11_33
 .LBB11_30:
-	pcmpeqb	%xmm0, %xmm1
-	pmovmskb	%xmm1, %r10d
+	pcmpeqb	%xmm1, %xmm2
+	pmovmskb	%xmm2, %r10d
 	testl	%r10d, %r10d
 	jne	.LBB11_34
 	addq	%r8, %r9
@@ -3066,7 +3068,7 @@ world_insert_or_spawn_batch:
 	incq	%rax
 	movq	%rax, 504(%r15)
 	movq	%r14, %rcx
-	movabsq	$-734742935035099969, %rax
+	movabsq	$-2048124429186041003, %rax
 	andq	%rax, %rcx
 	movdqu	(%r13,%rcx), %xmm0
 	pmovmskb	%xmm0, %eax
@@ -3103,7 +3105,7 @@ world_insert_or_spawn_batch:
 	movq	512(%r15), %r13
 	movq	520(%r15), %r14
 	movq	%r14, %rcx
-	movabsq	$-734742935035099969, %rax
+	movabsq	$-2048124429186041003, %rax
 	andq	%rax, %rcx
 	movdqu	(%r13,%rcx), %xmm0
 	pmovmskb	%xmm0, %eax
@@ -3133,14 +3135,14 @@ world_insert_or_spawn_batch:
 	subq	%rcx, 528(%r15)
 	leaq	-16(%rax), %rcx
 	andq	%r14, %rcx
-	movb	$122, (%r13,%rax)
-	movb	$122, 16(%rcx,%r13)
+	movb	$113, (%r13,%rax)
+	movb	$113, 16(%rcx,%r13)
 	incq	536(%r15)
 	negq	%rax
 	leaq	(%rax,%rax,2), %rax
-	movabsq	$-734742935035099969, %rcx
+	movabsq	$-2048124429186041003, %rcx
 	movq	%rcx, -24(%r13,%rax,8)
-	movabsq	$7088699894527553341, %rcx
+	movabsq	$1289492890058185568, %rcx
 	movq	%rcx, -16(%r13,%rax,8)
 	movq	%rbp, -8(%r13,%rax,8)
 	jmp	.LBB11_8
@@ -3153,7 +3155,7 @@ world_insert_or_spawn_batch:
 	movq	$2, 240(%rsp)
 	movabsq	$-9223372036854775808, %rdx
 	movq	%rdx, 184(%rsp)
-	leaq	.Lanon.ec88cfe8160c27a9dec3209ea7295488.7(%rip), %rdx
+	leaq	.Lanon.ec88cfe8160c27a9dec3209ea7295488.8(%rip), %rdx
 	movq	%rdx, 192(%rsp)
 	movq	$30, 200(%rsp)
 	movw	$256, 216(%rsp)
@@ -3184,7 +3186,7 @@ world_insert_or_spawn_batch:
 	movq	$2, 240(%rsp)
 	movabsq	$-9223372036854775808, %rdx
 	movq	%rdx, 184(%rsp)
-	leaq	.Lanon.ec88cfe8160c27a9dec3209ea7295488.8(%rip), %rdx
+	leaq	.Lanon.ec88cfe8160c27a9dec3209ea7295488.7(%rip), %rdx
 	movq	%rdx, 192(%rsp)
 	movq	$30, 200(%rsp)
 	movw	$256, 216(%rsp)
@@ -3347,7 +3349,7 @@ GCC_except_table11:
 	.type	.Lanon.ec88cfe8160c27a9dec3209ea7295488.3,@object
 	.section	.rodata..Lanon.ec88cfe8160c27a9dec3209ea7295488.3,"a",@progbits
 .Lanon.ec88cfe8160c27a9dec3209ea7295488.3:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/2701188/crates/bevy_ecs/src/archetype.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-11a63d9ba653d13e/56a7685/crates/bevy_ecs/src/archetype.rs"
 	.size	.Lanon.ec88cfe8160c27a9dec3209ea7295488.3, 95
 
 	.type	.Lanon.ec88cfe8160c27a9dec3209ea7295488.4,@object
@@ -3375,13 +3377,13 @@ GCC_except_table11:
 	.type	.Lanon.ec88cfe8160c27a9dec3209ea7295488.7,@object
 	.section	.rodata..Lanon.ec88cfe8160c27a9dec3209ea7295488.7,"a",@progbits
 .Lanon.ec88cfe8160c27a9dec3209ea7295488.7:
-	.ascii	"world_insert_or_spawn_batch::A"
+	.ascii	"world_insert_or_spawn_batch::B"
 	.size	.Lanon.ec88cfe8160c27a9dec3209ea7295488.7, 30
 
 	.type	.Lanon.ec88cfe8160c27a9dec3209ea7295488.8,@object
 	.section	.rodata..Lanon.ec88cfe8160c27a9dec3209ea7295488.8,"a",@progbits
 .Lanon.ec88cfe8160c27a9dec3209ea7295488.8:
-	.ascii	"world_insert_or_spawn_batch::B"
+	.ascii	"world_insert_or_spawn_batch::A"
 	.size	.Lanon.ec88cfe8160c27a9dec3209ea7295488.8, 30
 
 	.type	.Lanon.ec88cfe8160c27a9dec3209ea7295488.9,@object