diff --git a/Cargo.lock b/Cargo.lock
index 8d4f5ff..d16f1c6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -76,7 +76,7 @@ dependencies = [
 [[package]]
 name = "bevy_ecs"
 version = "0.12.0-dev"
-source = "git+https://github.com/bevyengine/bevy?branch=main#060711669903306c59eaea427498948992f0e768"
+source = "git+https://github.com/JoJoJet/bevy?branch=optimize_validate_world#c9f9133ed48cff8637de7daa9edb0e0fe980e2a7"
 dependencies = [
  "async-channel",
  "bevy_ecs_macros",
@@ -96,7 +96,7 @@ dependencies = [
 [[package]]
 name = "bevy_ecs_macros"
 version = "0.12.0-dev"
-source = "git+https://github.com/bevyengine/bevy?branch=main#060711669903306c59eaea427498948992f0e768"
+source = "git+https://github.com/JoJoJet/bevy?branch=optimize_validate_world#c9f9133ed48cff8637de7daa9edb0e0fe980e2a7"
 dependencies = [
  "bevy_macro_utils",
  "proc-macro2",
@@ -107,7 +107,7 @@ dependencies = [
 [[package]]
 name = "bevy_macro_utils"
 version = "0.12.0-dev"
-source = "git+https://github.com/bevyengine/bevy?branch=main#060711669903306c59eaea427498948992f0e768"
+source = "git+https://github.com/JoJoJet/bevy?branch=optimize_validate_world#c9f9133ed48cff8637de7daa9edb0e0fe980e2a7"
 dependencies = [
  "quote",
  "rustc-hash",
@@ -118,12 +118,12 @@ dependencies = [
 [[package]]
 name = "bevy_ptr"
 version = "0.12.0-dev"
-source = "git+https://github.com/bevyengine/bevy?branch=main#060711669903306c59eaea427498948992f0e768"
+source = "git+https://github.com/JoJoJet/bevy?branch=optimize_validate_world#c9f9133ed48cff8637de7daa9edb0e0fe980e2a7"
 
 [[package]]
 name = "bevy_reflect"
 version = "0.12.0-dev"
-source = "git+https://github.com/bevyengine/bevy?branch=main#060711669903306c59eaea427498948992f0e768"
+source = "git+https://github.com/JoJoJet/bevy?branch=optimize_validate_world#c9f9133ed48cff8637de7daa9edb0e0fe980e2a7"
 dependencies = [
  "bevy_ptr",
  "bevy_reflect_derive",
@@ -139,7 +139,7 @@ dependencies = [
 [[package]]
 name = "bevy_reflect_derive"
 version = "0.12.0-dev"
-source = "git+https://github.com/bevyengine/bevy?branch=main#060711669903306c59eaea427498948992f0e768"
+source = "git+https://github.com/JoJoJet/bevy?branch=optimize_validate_world#c9f9133ed48cff8637de7daa9edb0e0fe980e2a7"
 dependencies = [
  "bevy_macro_utils",
  "bit-set",
@@ -152,7 +152,7 @@ dependencies = [
 [[package]]
 name = "bevy_tasks"
 version = "0.12.0-dev"
-source = "git+https://github.com/bevyengine/bevy?branch=main#060711669903306c59eaea427498948992f0e768"
+source = "git+https://github.com/JoJoJet/bevy?branch=optimize_validate_world#c9f9133ed48cff8637de7daa9edb0e0fe980e2a7"
 dependencies = [
  "async-channel",
  "async-executor",
@@ -165,7 +165,7 @@ dependencies = [
 [[package]]
 name = "bevy_utils"
 version = "0.12.0-dev"
-source = "git+https://github.com/bevyengine/bevy?branch=main#060711669903306c59eaea427498948992f0e768"
+source = "git+https://github.com/JoJoJet/bevy?branch=optimize_validate_world#c9f9133ed48cff8637de7daa9edb0e0fe980e2a7"
 dependencies = [
  "ahash",
  "bevy_utils_proc_macros",
@@ -181,7 +181,7 @@ dependencies = [
 [[package]]
 name = "bevy_utils_proc_macros"
 version = "0.12.0-dev"
-source = "git+https://github.com/bevyengine/bevy?branch=main#060711669903306c59eaea427498948992f0e768"
+source = "git+https://github.com/JoJoJet/bevy?branch=optimize_validate_world#c9f9133ed48cff8637de7daa9edb0e0fe980e2a7"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index 50640fb..3bf1a9e 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/JoJoJet/bevy", branch = "optimize_validate_world" }
 
 [profile.release]
 opt-level = 3
diff --git a/results/entity_insert.s b/results/entity_insert.s
index 07b1a34..82b62c8 100644
--- a/results/entity_insert.s
+++ b/results/entity_insert.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"entity_insert.62ddec2744481769-cgu.0"
+	.file	"entity_insert.7f2f46508634b226-cgu.0"
 	.section	".text.core::ptr::drop_in_place<bevy_ecs::bundle::BundleInfo>","ax",@progbits
 	.p2align	4, 0x90
 	.type	core::ptr::drop_in_place<bevy_ecs::bundle::BundleInfo>,@function
@@ -143,16 +143,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	.LBB4_3
 	movq	(%rbx), %rcx
-	imulq	$88, %rax, %rax
+	shlq	$5, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -225,20 +226,18 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	cmpq	$5, %rsi
 	movl	$4, %r14d
 	cmovaeq	%rsi, %r14
-	movabsq	$768614336404564651, %rcx
+	movabsq	$104811045873349726, %rcx
 	xorl	%esi, %esi
 	cmpq	%rcx, %r14
 	setb	%sil
-	leaq	(,%r14,4), %rcx
-	leaq	(%rcx,%rcx,2), %rdx
-	shlq	$2, %rsi
+	imulq	$88, %r14, %rdx
+	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB5_3
 	movq	(%rbx), %rcx
-	shlq	$2, %rax
-	leaq	(%rax,%rax,2), %rax
+	imulq	$88, %rax, %rax
 	movq	%rcx, 8(%rsp)
-	movq	$4, 16(%rsp)
+	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
 	jmp	.LBB5_4
 .LBB5_3:
@@ -391,19 +390,20 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	cmpq	$5, %rsi
 	movl	$4, %r14d
 	cmovaeq	%rsi, %r14
+	movabsq	$768614336404564651, %rcx
 	xorl	%esi, %esi
-	movq	%r14, %rcx
-	shrq	$58, %rcx
-	sete	%sil
-	movq	%r14, %rdx
-	shlq	$5, %rdx
-	shlq	$3, %rsi
+	cmpq	%rcx, %r14
+	setb	%sil
+	leaq	(,%r14,4), %rcx
+	leaq	(%rcx,%rcx,2), %rdx
+	shlq	$2, %rsi
 	testq	%rax, %rax
 	je	.LBB7_3
 	movq	(%rbx), %rcx
-	shlq	$5, %rax
+	shlq	$2, %rax
+	leaq	(%rax,%rax,2), %rax
 	movq	%rcx, 8(%rsp)
-	movq	$8, 16(%rsp)
+	movq	$4, 16(%rsp)
 	movq	%rax, 24(%rsp)
 	jmp	.LBB7_4
 .LBB7_3:
@@ -1458,7 +1458,7 @@ hashbrown::raw::RawTable<T,A>::reserve_rehash:
 	.section	.rodata.cst16,"aM",@progbits,16
 	.p2align	4, 0x0
 .LCPI10_0:
-	.zero	16,114
+	.zero	16,99
 	.section	.text.entity_insert,"ax",@progbits
 	.globl	entity_insert
 	.p2align	4, 0x90
@@ -1490,9 +1490,9 @@ entity_insert:
 	.cfi_offset %rbp, -16
 	movd	%xmm0, 28(%rsp)
 	movq	%rdi, %rbx
-	movabsq	$7057337908989551013, %r13
-	movabsq	$-5402871694171262366, %rbp
-	movabsq	$-1916295987200284918, %r12
+	movabsq	$-992953597639325079, %r13
+	movabsq	$-6961215283856886765, %rbp
+	movabsq	$-4130630350342222577, %r12
 	movq	(%rdi), %r14
 	movl	760(%r14), %r15d
 	leaq	488(%r14), %rax
@@ -2113,8 +2113,8 @@ entity_insert:
 .LBB10_94:
 	leaq	-16(%rdx), %rdi
 	andq	%rcx, %rdi
-	movb	$114, (%rax,%rdx)
-	movb	$114, 16(%rdi,%rax)
+	movb	$99, (%rax,%rdx)
+	movb	$99, 16(%rdi,%rax)
 	negq	%rdx
 	andb	$1, %sil
 	movzbl	%sil, %ecx
@@ -2246,8 +2246,8 @@ entity_insert:
 .LBB10_109:
 	leaq	-16(%rsi), %rdi
 	andq	%rcx, %rdi
-	movb	$114, (%rax,%rsi)
-	movb	$114, 16(%rdi,%rax)
+	movb	$99, (%rax,%rsi)
+	movb	$99, 16(%rdi,%rax)
 	negq	%rsi
 	andb	$1, %dl
 	movzbl	%dl, %ecx
@@ -2400,7 +2400,7 @@ GCC_except_table10:
 	.type	.Lanon.83959b72e5b8236df4a28836bf490603.0,@object
 	.section	.rodata..Lanon.83959b72e5b8236df4a28836bf490603.0,"a",@progbits
 .Lanon.83959b72e5b8236df4a28836bf490603.0:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/0607116/crates/bevy_ecs/src/archetype.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-41530a2346942c86/c9f9133/crates/bevy_ecs/src/archetype.rs"
 	.size	.Lanon.83959b72e5b8236df4a28836bf490603.0, 95
 
 	.type	.Lanon.83959b72e5b8236df4a28836bf490603.1,@object
diff --git a/results/entity_remove.s b/results/entity_remove.s
index 97cff6a..f6e5a8c 100644
--- a/results/entity_remove.s
+++ b/results/entity_remove.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"entity_remove.c0da03d1b5df1202-cgu.0"
+	.file	"entity_remove.5fb07f434c8fe350-cgu.0"
 	.section	".text.core::ptr::drop_in_place<bevy_ecs::event::Events<bevy_ecs::removal_detection::RemovedComponentEntity>>","ax",@progbits
 	.p2align	4, 0x90
 	.type	core::ptr::drop_in_place<bevy_ecs::event::Events<bevy_ecs::removal_detection::RemovedComponentEntity>>,@function
@@ -261,18 +261,20 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	cmpq	$5, %rsi
 	movl	$4, %r14d
 	cmovaeq	%rsi, %r14
+	movabsq	$768614336404564651, %rcx
 	xorl	%esi, %esi
-	movq	%r14, %rcx
-	shrq	$60, %rcx
-	sete	%sil
-	leaq	(,%r14,8), %rdx
-	shlq	$3, %rsi
+	cmpq	%rcx, %r14
+	setb	%sil
+	leaq	(,%r14,4), %rcx
+	leaq	(%rcx,%rcx,2), %rdx
+	shlq	$2, %rsi
 	testq	%rax, %rax
 	je	.LBB6_3
 	movq	(%rbx), %rcx
-	shlq	$3, %rax
+	shlq	$2, %rax
+	leaq	(%rax,%rax,2), %rax
 	movq	%rcx, 8(%rsp)
-	movq	$8, 16(%rsp)
+	movq	$4, 16(%rsp)
 	movq	%rax, 24(%rsp)
 	jmp	.LBB6_4
 .LBB6_3:
@@ -343,17 +345,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	.LBB7_3
 	movq	(%rbx), %rcx
-	shlq	$5, %rax
+	imulq	$88, %rax, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -426,16 +427,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	.LBB8_3
 	movq	(%rbx), %rcx
-	imulq	$88, %rax, %rax
+	shlq	$5, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -508,20 +510,20 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	cmpq	$5, %rsi
 	movl	$4, %r14d
 	cmovaeq	%rsi, %r14
-	movabsq	$768614336404564651, %rcx
+	movabsq	$128102389400760776, %rcx
 	xorl	%esi, %esi
 	cmpq	%rcx, %r14
 	setb	%sil
-	leaq	(,%r14,4), %rcx
-	leaq	(%rcx,%rcx,2), %rdx
-	shlq	$2, %rsi
+	leaq	(,%r14,8), %rcx
+	leaq	(%rcx,%rcx,8), %rdx
+	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB9_3
 	movq	(%rbx), %rcx
-	shlq	$2, %rax
-	leaq	(%rax,%rax,2), %rax
+	shlq	$3, %rax
+	leaq	(%rax,%rax,8), %rax
 	movq	%rcx, 8(%rsp)
-	movq	$4, 16(%rsp)
+	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
 	jmp	.LBB9_4
 .LBB9_3:
@@ -592,18 +594,16 @@ 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	$60, %rcx
+	sete	%sil
+	leaq	(,%r14,8), %rdx
 	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB10_3
 	movq	(%rbx), %rcx
 	shlq	$3, %rax
-	leaq	(%rax,%rax,8), %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -1743,7 +1743,7 @@ hashbrown::raw::RawTable<T,A>::reserve_rehash:
 	.section	.rodata.cst16,"aM",@progbits,16
 	.p2align	4, 0x0
 .LCPI14_0:
-	.zero	16,35
+	.zero	16,1
 	.section	.text.entity_remove,"ax",@progbits
 	.globl	entity_remove
 	.p2align	4, 0x90
@@ -1773,9 +1773,9 @@ entity_remove:
 	.cfi_offset %r14, -32
 	.cfi_offset %r15, -24
 	.cfi_offset %rbp, -16
-	movabsq	$-5253275974501222917, %r15
-	movabsq	$1281256960393300292, %r14
-	movabsq	$5053152911497907348, %r12
+	movabsq	$-7265340872052208821, %r15
+	movabsq	$4725617993495381050, %r14
+	movabsq	$174476712822127042, %r12
 	movq	%rdi, 56(%rsp)
 	movq	(%rdi), %rbx
 	leaq	152(%rbx), %r13
@@ -2406,8 +2406,8 @@ entity_remove:
 .LBB14_38:
 	leaq	-16(%rdx), %rdi
 	andq	%rcx, %rdi
-	movb	$35, (%rax,%rdx)
-	movb	$35, 16(%rdi,%rax)
+	movb	$1, (%rax,%rdx)
+	movb	$1, 16(%rdi,%rax)
 	negq	%rdx
 	andb	$1, %sil
 	movzbl	%sil, %ecx
@@ -2543,8 +2543,8 @@ entity_remove:
 .LBB14_26:
 	leaq	-16(%rsi), %rdi
 	andq	%rcx, %rdi
-	movb	$35, (%rax,%rsi)
-	movb	$35, 16(%rdi,%rax)
+	movb	$1, (%rax,%rsi)
+	movb	$1, 16(%rdi,%rax)
 	negq	%rsi
 	andb	$1, %dl
 	movzbl	%dl, %ecx
@@ -2799,7 +2799,7 @@ GCC_except_table14:
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.1,@object
 	.section	.rodata..Lanon.ddd9cd1641521d33379e20f985469fcb.1,"a",@progbits
 .Lanon.ddd9cd1641521d33379e20f985469fcb.1:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/0607116/crates/bevy_ecs/src/world/entity_ref.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-41530a2346942c86/c9f9133/crates/bevy_ecs/src/world/entity_ref.rs"
 	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.1, 102
 
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.2,@object
@@ -2851,7 +2851,7 @@ GCC_except_table14:
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.8,@object
 	.section	.rodata..Lanon.ddd9cd1641521d33379e20f985469fcb.8,"a",@progbits
 .Lanon.ddd9cd1641521d33379e20f985469fcb.8:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/0607116/crates/bevy_ecs/src/archetype.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-41530a2346942c86/c9f9133/crates/bevy_ecs/src/archetype.rs"
 	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.8, 95
 
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.9,@object
@@ -2901,7 +2901,7 @@ GCC_except_table14:
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.15,@object
 	.section	.rodata..Lanon.ddd9cd1641521d33379e20f985469fcb.15,"a",@progbits
 .Lanon.ddd9cd1641521d33379e20f985469fcb.15:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/0607116/crates/bevy_ecs/src/storage/sparse_set.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-41530a2346942c86/c9f9133/crates/bevy_ecs/src/storage/sparse_set.rs"
 	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.15, 104
 
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.16,@object
@@ -2915,7 +2915,7 @@ GCC_except_table14:
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.17,@object
 	.section	.rodata..Lanon.ddd9cd1641521d33379e20f985469fcb.17,"a",@progbits
 .Lanon.ddd9cd1641521d33379e20f985469fcb.17:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/0607116/crates/bevy_ecs/src/storage/table.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-41530a2346942c86/c9f9133/crates/bevy_ecs/src/storage/table.rs"
 	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.17, 99
 
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.18,@object
diff --git a/results/entity_take.s b/results/entity_take.s
index 3e3fdda..2bd512d 100644
--- a/results/entity_take.s
+++ b/results/entity_take.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"entity_take.8889b72e880e5536-cgu.0"
+	.file	"entity_take.170142f90033f2d9-cgu.0"
 	.section	".text.core::ptr::drop_in_place<bevy_ecs::event::Events<bevy_ecs::removal_detection::RemovedComponentEntity>>","ax",@progbits
 	.p2align	4, 0x90
 	.type	core::ptr::drop_in_place<bevy_ecs::event::Events<bevy_ecs::removal_detection::RemovedComponentEntity>>,@function
@@ -178,17 +178,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	$59, %rcx
-	sete	%sil
-	movq	%r14, %rdx
-	shlq	$4, %rdx
+	cmpq	%rcx, %r14
+	setb	%sil
+	imulq	$88, %r14, %rdx
 	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB5_3
 	movq	(%rbx), %rcx
-	shlq	$4, %rax
+	imulq	$88, %rax, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -263,15 +262,15 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	cmovaeq	%rsi, %r14
 	xorl	%esi, %esi
 	movq	%r14, %rcx
-	shrq	$58, %rcx
+	shrq	$59, %rcx
 	sete	%sil
 	movq	%r14, %rdx
-	shlq	$5, %rdx
+	shlq	$4, %rdx
 	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB6_3
 	movq	(%rbx), %rcx
-	shlq	$5, %rax
+	shlq	$4, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -344,20 +343,19 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	cmpq	$5, %rsi
 	movl	$4, %r14d
 	cmovaeq	%rsi, %r14
-	movabsq	$768614336404564651, %rcx
 	xorl	%esi, %esi
-	cmpq	%rcx, %r14
-	setb	%sil
-	leaq	(,%r14,4), %rcx
-	leaq	(%rcx,%rcx,2), %rdx
-	shlq	$2, %rsi
+	movq	%r14, %rcx
+	shrq	$58, %rcx
+	sete	%sil
+	movq	%r14, %rdx
+	shlq	$5, %rdx
+	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB7_3
 	movq	(%rbx), %rcx
-	shlq	$2, %rax
-	leaq	(%rax,%rax,2), %rax
+	shlq	$5, %rax
 	movq	%rcx, 8(%rsp)
-	movq	$4, 16(%rsp)
+	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
 	jmp	.LBB7_4
 .LBB7_3:
@@ -510,20 +508,20 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	cmpq	$5, %rsi
 	movl	$4, %r14d
 	cmovaeq	%rsi, %r14
-	movabsq	$128102389400760776, %rcx
+	movabsq	$768614336404564651, %rcx
 	xorl	%esi, %esi
 	cmpq	%rcx, %r14
 	setb	%sil
-	leaq	(,%r14,8), %rcx
-	leaq	(%rcx,%rcx,8), %rdx
-	shlq	$3, %rsi
+	leaq	(,%r14,4), %rcx
+	leaq	(%rcx,%rcx,2), %rdx
+	shlq	$2, %rsi
 	testq	%rax, %rax
 	je	.LBB9_3
 	movq	(%rbx), %rcx
-	shlq	$3, %rax
-	leaq	(%rax,%rax,8), %rax
+	shlq	$2, %rax
+	leaq	(%rax,%rax,2), %rax
 	movq	%rcx, 8(%rsp)
-	movq	$8, 16(%rsp)
+	movq	$4, 16(%rsp)
 	movq	%rax, 24(%rsp)
 	jmp	.LBB9_4
 .LBB9_3:
@@ -594,16 +592,18 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	cmpq	$5, %rsi
 	movl	$4, %r14d
 	cmovaeq	%rsi, %r14
-	movabsq	$104811045873349726, %rcx
+	movabsq	$128102389400760776, %rcx
 	xorl	%esi, %esi
 	cmpq	%rcx, %r14
 	setb	%sil
-	imulq	$88, %r14, %rdx
+	leaq	(,%r14,8), %rcx
+	leaq	(%rcx,%rcx,8), %rdx
 	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB10_3
 	movq	(%rbx), %rcx
-	imulq	$88, %rax, %rax
+	shlq	$3, %rax
+	leaq	(%rax,%rax,8), %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -1743,7 +1743,7 @@ hashbrown::raw::RawTable<T,A>::reserve_rehash:
 	.section	.rodata.cst16,"aM",@progbits,16
 	.p2align	4, 0x0
 .LCPI14_0:
-	.zero	16,49
+	.zero	16,36
 	.section	.text.entity_remove,"ax",@progbits
 	.globl	entity_remove
 	.p2align	4, 0x90
@@ -1774,9 +1774,9 @@ entity_remove:
 	.cfi_offset %r15, -24
 	.cfi_offset %rbp, -16
 	movq	%rdi, %rbx
-	movabsq	$-4547187441830690457, %r14
-	movabsq	$2573649479492011848, %r15
-	movabsq	$7143319845380590824, %r12
+	movabsq	$2890305900548806722, %r14
+	movabsq	$7617583234824517081, %r15
+	movabsq	$5248143753393295693, %r12
 	movq	(%rdi), %r13
 	leaq	152(%r13), %rax
 	movq	%rax, 40(%rsp)
@@ -2404,8 +2404,8 @@ entity_remove:
 .LBB14_48:
 	leaq	-16(%rdx), %rdi
 	andq	%rcx, %rdi
-	movb	$49, (%rax,%rdx)
-	movb	$49, 16(%rdi,%rax)
+	movb	$36, (%rax,%rdx)
+	movb	$36, 16(%rdi,%rax)
 	negq	%rdx
 	andb	$1, %sil
 	movzbl	%sil, %ecx
@@ -2530,8 +2530,8 @@ entity_remove:
 .LBB14_31:
 	leaq	-16(%rsi), %rdi
 	andq	%rcx, %rdi
-	movb	$49, (%rax,%rsi)
-	movb	$49, 16(%rdi,%rax)
+	movb	$36, (%rax,%rsi)
+	movb	$36, 16(%rdi,%rax)
 	negq	%rsi
 	andb	$1, %dl
 	movzbl	%dl, %ecx
@@ -2797,7 +2797,7 @@ GCC_except_table14:
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.1,@object
 	.section	.rodata..Lanon.ddd9cd1641521d33379e20f985469fcb.1,"a",@progbits
 .Lanon.ddd9cd1641521d33379e20f985469fcb.1:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/0607116/crates/bevy_ecs/src/world/entity_ref.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-41530a2346942c86/c9f9133/crates/bevy_ecs/src/world/entity_ref.rs"
 	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.1, 102
 
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.2,@object
@@ -2849,7 +2849,7 @@ GCC_except_table14:
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.8,@object
 	.section	.rodata..Lanon.ddd9cd1641521d33379e20f985469fcb.8,"a",@progbits
 .Lanon.ddd9cd1641521d33379e20f985469fcb.8:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/0607116/crates/bevy_ecs/src/archetype.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-41530a2346942c86/c9f9133/crates/bevy_ecs/src/archetype.rs"
 	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.8, 95
 
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.9,@object
@@ -2909,7 +2909,7 @@ GCC_except_table14:
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.16,@object
 	.section	.rodata..Lanon.ddd9cd1641521d33379e20f985469fcb.16,"a",@progbits
 .Lanon.ddd9cd1641521d33379e20f985469fcb.16:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/0607116/crates/bevy_ecs/src/storage/sparse_set.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-41530a2346942c86/c9f9133/crates/bevy_ecs/src/storage/sparse_set.rs"
 	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.16, 104
 
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.17,@object
@@ -2923,7 +2923,7 @@ GCC_except_table14:
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.18,@object
 	.section	.rodata..Lanon.ddd9cd1641521d33379e20f985469fcb.18,"a",@progbits
 .Lanon.ddd9cd1641521d33379e20f985469fcb.18:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/0607116/crates/bevy_ecs/src/storage/table.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-41530a2346942c86/c9f9133/crates/bevy_ecs/src/storage/table.rs"
 	.size	.Lanon.ddd9cd1641521d33379e20f985469fcb.18, 99
 
 	.type	.Lanon.ddd9cd1641521d33379e20f985469fcb.19,@object
diff --git a/results/event_reader.s b/results/event_reader.s
index fbe9869..ba8f3ed 100644
--- a/results/event_reader.s
+++ b/results/event_reader.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"event_reader.5f1b1415aff01095-cgu.0"
+	.file	"event_reader.a44c869bd18670c1-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 d15caa1..1bc748a 100644
--- a/results/event_writer.s
+++ b/results/event_writer.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"event_writer.accc283909383b7e-cgu.0"
+	.file	"event_writer.4bd56a4163680cf-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 c4fb59f..033d3f9 100644
--- a/results/query_for_each.s
+++ b/results/query_for_each.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"query_for_each.5fe9d0b944630bf6-cgu.0"
+	.file	"query_for_each.7558f9ac15610330-cgu.0"
 	.section	.text.query_for_each,"ax",@progbits
 	.globl	query_for_each
 	.p2align	4, 0x90
diff --git a/results/query_for_each_sparse.s b/results/query_for_each_sparse.s
index 6c04bd1..ccafac3 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.a2c07d60da66cf9-cgu.0"
+	.file	"query_for_each_sparse.1b81eaf278810063-cgu.0"
 	.section	.text.query_for_each,"ax",@progbits
 	.globl	query_for_each
 	.p2align	4, 0x90
diff --git a/results/query_get.s b/results/query_get.s
index 2e3a9f5..0b46de9 100644
--- a/results/query_get.s
+++ b/results/query_get.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"query_get.aacaec8b5bd9ade1-cgu.0"
+	.file	"query_get.7c71a028bdc095b6-cgu.0"
 	.section	.text.query_get,"ax",@progbits
 	.globl	query_get
 	.p2align	4, 0x90
diff --git a/results/query_get_sparse.s b/results/query_get_sparse.s
index 1c72123..5482831 100644
--- a/results/query_get_sparse.s
+++ b/results/query_get_sparse.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"query_get_sparse.f9f8140f1ab0139b-cgu.0"
+	.file	"query_get_sparse.d04918bef90d0fe6-cgu.0"
 	.section	.text.query_get,"ax",@progbits
 	.globl	query_get
 	.p2align	4, 0x90
diff --git a/results/query_iter.s b/results/query_iter.s
index 019b7fe..68b1c1a 100644
--- a/results/query_iter.s
+++ b/results/query_iter.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"query_iter.6857d8b1031b9902-cgu.0"
+	.file	"query_iter.5169cbd10e63c307-cgu.0"
 	.section	.text.query_iter,"ax",@progbits
 	.globl	query_iter
 	.p2align	4, 0x90
diff --git a/results/query_iter_sparse.s b/results/query_iter_sparse.s
index d9de651..fb95635 100644
--- a/results/query_iter_sparse.s
+++ b/results/query_iter_sparse.s
@@ -1,5 +1,5 @@
 	.text
-	.file	"query_iter_sparse.d7a2203d190ac533-cgu.0"
+	.file	"query_iter_sparse.6b26c7f16fe6b19-cgu.0"
 	.section	.text.query_iter,"ax",@progbits
 	.globl	query_iter
 	.p2align	4, 0x90
diff --git a/results/query_state_for_each.s b/results/query_state_for_each.s
index d970ad6..d9c484c 100644
--- a/results/query_state_for_each.s
+++ b/results/query_state_for_each.s
@@ -1,19 +1,5 @@
 	.text
-	.file	"query_state_for_each.d4b616e02f9ccc6f-cgu.0"
-	.section	".text.<&T as core::fmt::Display>::fmt","ax",@progbits
-	.p2align	4, 0x90
-	.type	<&T as core::fmt::Display>::fmt,@function
-<&T as core::fmt::Display>::fmt:
-	.cfi_startproc
-	movq	%rsi, %rdx
-	movq	(%rdi), %rax
-	movq	8(%rdi), %rsi
-	movq	%rax, %rdi
-	jmpq	*<str as core::fmt::Display>::fmt@GOTPCREL(%rip)
-.Lfunc_end0:
-	.size	<&T as core::fmt::Display>::fmt, .Lfunc_end0-<&T as core::fmt::Display>::fmt
-	.cfi_endproc
-
+	.file	"query_state_for_each.ad7f2a3a55f8580f-cgu.0"
 	.section	".text.core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>","ax",@progbits
 	.p2align	4, 0x90
 	.type	core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>,@function
@@ -37,53 +23,53 @@ core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::compo
 	movq	%rdi, %rbx
 	movq	32(%rdi), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_2
+	je	.LBB0_2
 	movq	24(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB1_2:
+.LBB0_2:
 	movq	64(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_4
+	je	.LBB0_4
 	movq	56(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB1_4:
+.LBB0_4:
 	movq	(%rbx), %r14
 	movq	16(%rbx), %r15
 	testq	%r15, %r15
-	je	.LBB1_11
+	je	.LBB0_11
 	leaq	40(%r14), %r12
 	movq	__rust_dealloc@GOTPCREL(%rip), %r13
-	jmp	.LBB1_6
+	jmp	.LBB0_6
 	.p2align	4, 0x90
-.LBB1_10:
+.LBB0_10:
 	addq	$64, %r12
 	decq	%r15
-	je	.LBB1_11
-.LBB1_6:
+	je	.LBB0_11
+.LBB0_6:
 	movq	-32(%r12), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_8
+	je	.LBB0_8
 	movq	-40(%r12), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*%r13
-.LBB1_8:
+.LBB0_8:
 	movq	(%r12), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_10
+	je	.LBB0_10
 	movq	-8(%r12), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*%r13
-	jmp	.LBB1_10
-.LBB1_11:
+	jmp	.LBB0_10
+.LBB0_11:
 	movq	8(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_12
+	je	.LBB0_12
 	shlq	$6, %rsi
 	movl	$8, %edx
 	movq	%r14, %rdi
@@ -98,7 +84,7 @@ core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::compo
 	popq	%r15
 	.cfi_def_cfa_offset 8
 	jmpq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB1_12:
+.LBB0_12:
 	.cfi_def_cfa_offset 48
 	popq	%rbx
 	.cfi_def_cfa_offset 40
@@ -111,8 +97,8 @@ core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::compo
 	popq	%r15
 	.cfi_def_cfa_offset 8
 	retq
-.Lfunc_end1:
-	.size	core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>, .Lfunc_end1-core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>
+.Lfunc_end0:
+	.size	core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>, .Lfunc_end0-core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>
 	.cfi_endproc
 
 	.section	".text.core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_for_each::A,&query_state_for_each::B)>>","ax",@progbits
@@ -134,51 +120,51 @@ core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_fo
 	movq	%rdi, %rbx
 	movq	24(%rdi), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_2
+	je	.LBB1_2
 	movq	16(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_2:
+.LBB1_2:
 	movq	56(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_4
+	je	.LBB1_4
 	movq	48(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_4:
+.LBB1_4:
 	movq	88(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_6
+	je	.LBB1_6
 	movq	80(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_6:
+.LBB1_6:
 	movq	120(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_8
+	je	.LBB1_8
 	movq	112(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_8:
+.LBB1_8:
 	leaq	152(%rbx), %rdi
 .Ltmp0:
 	callq	core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>
 .Ltmp1:
 	movq	256(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_11
+	je	.LBB1_11
 	movq	248(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_11:
+.LBB1_11:
 	movq	280(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_16
+	je	.LBB1_16
 	movq	272(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
@@ -189,7 +175,7 @@ core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_fo
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	jmpq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_16:
+.LBB1_16:
 	.cfi_def_cfa_offset 32
 	addq	$8, %rsp
 	.cfi_def_cfa_offset 24
@@ -198,7 +184,7 @@ core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_fo
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB2_13:
+.LBB1_13:
 	.cfi_def_cfa_offset 32
 .Ltmp2:
 	movq	%rax, %r14
@@ -215,16 +201,16 @@ core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_fo
 	movq	%r14, %rdi
 	callq	_Unwind_Resume@PLT
 	ud2
-.LBB2_17:
+.LBB1_17:
 .Ltmp7:
 	callq	*core::panicking::panic_cannot_unwind@GOTPCREL(%rip)
 	ud2
-.Lfunc_end2:
-	.size	core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_for_each::A,&query_state_for_each::B)>>, .Lfunc_end2-core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_for_each::A,&query_state_for_each::B)>>
+.Lfunc_end1:
+	.size	core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_for_each::A,&query_state_for_each::B)>>, .Lfunc_end1-core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_for_each::A,&query_state_for_each::B)>>
 	.cfi_endproc
 	.section	".gcc_except_table.core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_for_each::A,&query_state_for_each::B)>>","a",@progbits
 	.p2align	2, 0x0
-GCC_except_table2:
+GCC_except_table1:
 .Lexception0:
 	.byte	255
 	.byte	155
@@ -242,7 +228,7 @@ GCC_except_table2:
 	.uleb128 .Ltmp7-.Lfunc_begin0
 	.byte	1
 	.uleb128 .Ltmp6-.Lfunc_begin0
-	.uleb128 .Lfunc_end2-.Ltmp6
+	.uleb128 .Lfunc_end1-.Ltmp6
 	.byte	0
 	.byte	0
 .Lcst_end0:
@@ -259,14 +245,14 @@ GCC_except_table2:
 core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>:
 	.cfi_startproc
 	testq	%rsi, %rsi
-	je	.LBB3_1
+	je	.LBB2_1
 	shlq	$2, %rsi
 	movl	$4, %edx
 	jmpq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB3_1:
+.LBB2_1:
 	retq
-.Lfunc_end3:
-	.size	core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>, .Lfunc_end3-core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>
+.Lfunc_end2:
+	.size	core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>, .Lfunc_end2-core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>
 	.cfi_endproc
 
 	.section	".text.core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>","ax",@progbits
@@ -275,14 +261,14 @@ core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>:
 core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>:
 	.cfi_startproc
 	testq	%rsi, %rsi
-	je	.LBB4_1
+	je	.LBB3_1
 	shlq	$2, %rsi
 	movl	$4, %edx
 	jmpq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB4_1:
+.LBB3_1:
 	retq
-.Lfunc_end4:
-	.size	core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>, .Lfunc_end4-core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>
+.Lfunc_end3:
+	.size	core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>, .Lfunc_end3-core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>
 	.cfi_endproc
 
 	.section	.text.alloc::raw_vec::finish_grow,"ax",@progbits
@@ -302,41 +288,41 @@ alloc::raw_vec::finish_grow:
 	movq	%rdx, %rbx
 	movq	%rdi, %r14
 	testq	%rsi, %rsi
-	je	.LBB5_6
+	je	.LBB4_6
 	movq	%rsi, %r15
 	cmpq	$0, 8(%rcx)
-	je	.LBB5_7
+	je	.LBB4_7
 	movq	16(%rcx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB5_7
+	je	.LBB4_7
 	movq	(%rcx), %rdi
 	movq	%r15, %rdx
 	movq	%rbx, %rcx
 	callq	*__rust_realloc@GOTPCREL(%rip)
 	testq	%rax, %rax
-	jne	.LBB5_11
-.LBB5_4:
+	jne	.LBB4_11
+.LBB4_4:
 	movq	%r15, 8(%r14)
-	jmp	.LBB5_5
-.LBB5_7:
+	jmp	.LBB4_5
+.LBB4_7:
 	testq	%rbx, %rbx
-	je	.LBB5_8
+	je	.LBB4_8
 	movq	__rust_no_alloc_shim_is_unstable@GOTPCREL(%rip), %rax
 	movzbl	(%rax), %eax
 	movq	%rbx, %rdi
 	movq	%r15, %rsi
 	callq	*__rust_alloc@GOTPCREL(%rip)
 	testq	%rax, %rax
-	je	.LBB5_4
-.LBB5_11:
+	je	.LBB4_4
+.LBB4_11:
 	movq	%rax, 8(%r14)
 	xorl	%eax, %eax
-	jmp	.LBB5_12
-.LBB5_6:
+	jmp	.LBB4_12
+.LBB4_6:
 	movq	$0, 8(%r14)
-.LBB5_5:
+.LBB4_5:
 	movl	$1, %eax
-.LBB5_12:
+.LBB4_12:
 	movq	%rbx, 16(%r14)
 	movq	%rax, (%r14)
 	popq	%rbx
@@ -346,14 +332,14 @@ alloc::raw_vec::finish_grow:
 	popq	%r15
 	.cfi_def_cfa_offset 8
 	retq
-.LBB5_8:
+.LBB4_8:
 	.cfi_def_cfa_offset 32
 	movq	%r15, %rax
 	testq	%rax, %rax
-	jne	.LBB5_11
-	jmp	.LBB5_4
-.Lfunc_end5:
-	.size	alloc::raw_vec::finish_grow, .Lfunc_end5-alloc::raw_vec::finish_grow
+	jne	.LBB4_11
+	jmp	.LBB4_4
+.Lfunc_end4:
+	.size	alloc::raw_vec::finish_grow, .Lfunc_end4-alloc::raw_vec::finish_grow
 	.cfi_endproc
 
 	.section	".text.alloc::raw_vec::RawVec<T,A>::reserve_for_push","ax",@progbits
@@ -370,7 +356,7 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	.cfi_offset %rbx, -24
 	.cfi_offset %r14, -16
 	incq	%rsi
-	je	.LBB6_10
+	je	.LBB5_10
 	movq	%rdi, %rbx
 	movq	8(%rdi), %rax
 	leaq	(%rax,%rax), %rcx
@@ -386,25 +372,25 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	leaq	(,%r14,4), %rdx
 	shlq	$2, %rsi
 	testq	%rax, %rax
-	je	.LBB6_3
+	je	.LBB5_3
 	movq	(%rbx), %rcx
 	shlq	$2, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$4, 16(%rsp)
 	movq	%rax, 24(%rsp)
-	jmp	.LBB6_4
-.LBB6_3:
+	jmp	.LBB5_4
+.LBB5_3:
 	movq	$0, 16(%rsp)
-.LBB6_4:
+.LBB5_4:
 	leaq	32(%rsp), %rdi
 	leaq	8(%rsp), %rcx
 	callq	alloc::raw_vec::finish_grow
 	cmpq	$0, 32(%rsp)
 	movq	40(%rsp), %rdi
-	je	.LBB6_5
+	je	.LBB5_5
 	movabsq	$-9223372036854775807, %rax
 	cmpq	%rax, %rdi
-	jne	.LBB6_8
+	jne	.LBB5_8
 	addq	$56, %rsp
 	.cfi_def_cfa_offset 24
 	popq	%rbx
@@ -412,7 +398,7 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB6_5:
+.LBB5_5:
 	.cfi_def_cfa_offset 80
 	movq	%rdi, (%rbx)
 	movq	%r14, 8(%rbx)
@@ -423,19 +409,19 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB6_8:
+.LBB5_8:
 	.cfi_def_cfa_offset 80
 	testq	%rdi, %rdi
-	jne	.LBB6_9
-.LBB6_10:
+	jne	.LBB5_9
+.LBB5_10:
 	callq	*alloc::raw_vec::capacity_overflow@GOTPCREL(%rip)
 	ud2
-.LBB6_9:
+.LBB5_9:
 	movq	48(%rsp), %rsi
 	callq	*alloc::alloc::handle_alloc_error@GOTPCREL(%rip)
 	ud2
-.Lfunc_end6:
-	.size	alloc::raw_vec::RawVec<T,A>::reserve_for_push, .Lfunc_end6-alloc::raw_vec::RawVec<T,A>::reserve_for_push
+.Lfunc_end5:
+	.size	alloc::raw_vec::RawVec<T,A>::reserve_for_push, .Lfunc_end5-alloc::raw_vec::RawVec<T,A>::reserve_for_push
 	.cfi_endproc
 
 	.section	".text.alloc::raw_vec::RawVec<T,A>::reserve_for_push","ax",@progbits
@@ -452,7 +438,7 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	.cfi_offset %rbx, -24
 	.cfi_offset %r14, -16
 	incq	%rsi
-	je	.LBB7_10
+	je	.LBB6_10
 	movq	%rdi, %rbx
 	movq	8(%rdi), %rax
 	leaq	(%rax,%rax), %rcx
@@ -468,25 +454,25 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	leaq	(,%r14,4), %rdx
 	shlq	$2, %rsi
 	testq	%rax, %rax
-	je	.LBB7_3
+	je	.LBB6_3
 	movq	(%rbx), %rcx
 	shlq	$2, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$4, 16(%rsp)
 	movq	%rax, 24(%rsp)
-	jmp	.LBB7_4
-.LBB7_3:
+	jmp	.LBB6_4
+.LBB6_3:
 	movq	$0, 16(%rsp)
-.LBB7_4:
+.LBB6_4:
 	leaq	32(%rsp), %rdi
 	leaq	8(%rsp), %rcx
 	callq	alloc::raw_vec::finish_grow
 	cmpq	$0, 32(%rsp)
 	movq	40(%rsp), %rdi
-	je	.LBB7_5
+	je	.LBB6_5
 	movabsq	$-9223372036854775807, %rax
 	cmpq	%rax, %rdi
-	jne	.LBB7_8
+	jne	.LBB6_8
 	addq	$56, %rsp
 	.cfi_def_cfa_offset 24
 	popq	%rbx
@@ -494,7 +480,7 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB7_5:
+.LBB6_5:
 	.cfi_def_cfa_offset 80
 	movq	%rdi, (%rbx)
 	movq	%r14, 8(%rbx)
@@ -505,19 +491,19 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB7_8:
+.LBB6_8:
 	.cfi_def_cfa_offset 80
 	testq	%rdi, %rdi
-	jne	.LBB7_9
-.LBB7_10:
+	jne	.LBB6_9
+.LBB6_10:
 	callq	*alloc::raw_vec::capacity_overflow@GOTPCREL(%rip)
 	ud2
-.LBB7_9:
+.LBB6_9:
 	movq	48(%rsp), %rsi
 	callq	*alloc::alloc::handle_alloc_error@GOTPCREL(%rip)
 	ud2
-.Lfunc_end7:
-	.size	alloc::raw_vec::RawVec<T,A>::reserve_for_push, .Lfunc_end7-alloc::raw_vec::RawVec<T,A>::reserve_for_push
+.Lfunc_end6:
+	.size	alloc::raw_vec::RawVec<T,A>::reserve_for_push, .Lfunc_end6-alloc::raw_vec::RawVec<T,A>::reserve_for_push
 	.cfi_endproc
 
 	.section	.text.query_state_for_each,"ax",@progbits
@@ -549,17 +535,19 @@ query_state_for_each:
 	.cfi_offset %r14, -32
 	.cfi_offset %r15, -24
 	.cfi_offset %rbp, -16
-	movq	(%rdi), %rax
-	cmpq	752(%rsi), %rax
-	movq	%rdi, (%rsp)
-	jne	.LBB8_1
+	movq	%rsi, %rax
 	movq	%rdi, %r15
-	movq	%rsi, 96(%rsp)
-	movq	168(%rsi), %r8
-	movq	8(%rdi), %r13
-	movq	%r8, 8(%rdi)
-	cmpq	%r8, %r13
-	jae	.LBB8_48
+	movq	752(%rsi), %rsi
+	movq	(%rdi), %rdi
+	cmpq	%rsi, %rdi
+	jne	.LBB7_5
+	movq	%rax, 88(%rsp)
+	movq	168(%rax), %rsi
+	movq	8(%r15), %r13
+	movq	%rsi, 8(%r15)
+	cmpq	%rsi, %r13
+	movq	%r15, 8(%rsp)
+	jae	.LBB7_47
 	leaq	80(%r15), %rax
 	movq	%rax, 80(%rsp)
 	leaq	104(%r15), %rax
@@ -567,78 +555,78 @@ query_state_for_each:
 	leaq	112(%r15), %rax
 	movq	%rax, 128(%rsp)
 	leaq	136(%r15), %rax
-	movq	%rax, 120(%rsp)
+	movq	%rax, 112(%rsp)
 	leaq	312(%r15), %rax
 	movq	%rax, 168(%rsp)
 	leaq	48(%r15), %rax
 	movq	%rax, 160(%rsp)
 	leaq	72(%r15), %rax
-	movq	%rax, 112(%rsp)
+	movq	%rax, 104(%rsp)
 	leaq	272(%r15), %rax
 	movq	%rax, 144(%rsp)
 	leaq	16(%r15), %rax
 	movq	%rax, 152(%rsp)
 	leaq	40(%r15), %rax
-	movq	%rax, 104(%rsp)
+	movq	%rax, 96(%rsp)
 	leaq	248(%r15), %rax
 	movq	%rax, 136(%rsp)
-	movq	96(%rsp), %rax
+	movq	88(%rsp), %rax
 	movq	152(%rax), %rdx
-	movq	%r8, 88(%rsp)
-	movq	%rdx, 8(%rsp)
-	jmp	.LBB8_6
-.LBB8_45:
-	movq	(%rsp), %r15
+	movq	%rsi, 120(%rsp)
+	movq	%rdx, 24(%rsp)
+	jmp	.LBB7_3
+.LBB7_44:
+	movq	8(%rsp), %r15
 	movq	264(%r15), %rsi
-.LBB8_46:
-	movq	88(%rsp), %r8
-	movq	8(%rsp), %rdx
+.LBB7_45:
+	movq	24(%rsp), %rdx
 	movq	248(%r15), %rax
 	movl	%ebp, (%rax,%rsi,4)
 	incq	%rsi
 	movq	%rsi, 264(%r15)
+	movq	120(%rsp), %rsi
 	.p2align	4, 0x90
-.LBB8_47:
+.LBB7_46:
 	incq	%r13
-	cmpq	%r13, %r8
-	je	.LBB8_48
-.LBB8_6:
+	cmpq	%r13, %rsi
+	je	.LBB7_47
+.LBB7_3:
 	movl	%r13d, %edi
-	cmpq	%r8, %rdi
-	jae	.LBB8_7
-	imulq	$152, %rdi, %rsi
+	cmpq	%rsi, %rdi
+	jae	.LBB7_4
+	imulq	$152, %rdi, %rdi
 	movq	296(%r15), %rax
-	movq	136(%rdx,%rsi), %rcx
+	movq	136(%rdx,%rdi), %rcx
 	cmpq	%rax, %rcx
-	jbe	.LBB8_47
-	movq	128(%rdx,%rsi), %rbx
+	jbe	.LBB7_46
+	movq	128(%rdx,%rdi), %rbx
 	testq	%rbx, %rbx
-	je	.LBB8_47
+	je	.LBB7_46
 	shlq	$4, %rax
 	cmpq	$0, (%rbx,%rax)
-	je	.LBB8_47
+	je	.LBB7_46
 	movq	304(%r15), %r12
 	cmpq	%r12, %rcx
-	jbe	.LBB8_47
+	jbe	.LBB7_46
 	shlq	$4, %r12
 	cmpq	$0, (%rbx,%r12)
-	je	.LBB8_47
-	movq	%rsi, 72(%rsp)
-	movq	96(%rdx,%rsi), %rcx
+	je	.LBB7_46
+	movq	%rdi, 72(%rsp)
+	movq	96(%rdx,%rdi), %rcx
 	movq	8(%rbx,%rax), %rax
 	shlq	$4, %rax
 	movq	%rcx, 176(%rsp)
 	movq	(%rcx,%rax), %r14
 	leaq	1(%r14), %r15
-.Ltmp10:
+.Ltmp12:
 	movq	80(%rsp), %rdi
 	movq	%r15, %rsi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp11:
-	movq	%r14, 48(%rsp)
+.Ltmp13:
+	movq	%r14, 16(%rsp)
 	movq	64(%rsp), %rax
 	cmpq	%r14, (%rax)
-	jbe	.LBB8_15
+	jbe	.LBB7_14
 	movq	%r15, %rsi
 	movq	%r14, %rbp
 	shrq	$5, %rbp
@@ -648,34 +636,34 @@ query_state_for_each:
 	movq	80(%rsp), %rax
 	movq	(%rax), %rax
 	orl	%r15d, (%rax,%rbp,4)
-.Ltmp12:
+.Ltmp14:
 	movq	128(%rsp), %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp13:
-	movq	%r14, 48(%rsp)
-	movq	120(%rsp), %rax
+.Ltmp15:
+	movq	%r14, 16(%rsp)
+	movq	112(%rsp), %rax
 	cmpq	%r14, (%rax)
-	jbe	.LBB8_20
+	jbe	.LBB7_19
 	movq	128(%rsp), %rax
 	movq	(%rax), %rax
 	orl	%r15d, (%rax,%rbp,4)
 	leaq	(%rbx,%r12), %rax
 	cmpq	$0, (%rax)
 	movq	80(%rsp), %rdx
-	je	.LBB8_25
+	je	.LBB7_24
 	movq	8(%rbx,%r12), %rax
 	shlq	$4, %rax
 	movq	176(%rsp), %rcx
 	movq	(%rcx,%rax), %r14
 	leaq	1(%r14), %rsi
-.Ltmp14:
+.Ltmp16:
 	movq	%rdx, %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp15:
-	movq	%r14, 48(%rsp)
+.Ltmp17:
+	movq	%r14, 16(%rsp)
 	movq	64(%rsp), %rax
 	cmpq	%r14, (%rax)
-	jbe	.LBB8_15
+	jbe	.LBB7_14
 	movl	$1, %eax
 	movl	%r14d, %ecx
 	shll	%cl, %eax
@@ -683,104 +671,104 @@ query_state_for_each:
 	movq	(%rdx), %rcx
 	shrq	$5, %r14
 	orl	%eax, (%rcx,%r14,4)
-.LBB8_25:
-.Ltmp16:
-	movq	8(%rsp), %rax
+.LBB7_24:
+.Ltmp18:
+	movq	24(%rsp), %rax
 	movq	72(%rsp), %rcx
 	leaq	(%rax,%rcx), %rsi
 	movq	168(%rsp), %rdi
 	callq	*<() as bevy_ecs::query::fetch::WorldQuery>::update_archetype_component_access@GOTPCREL(%rip)
-.Ltmp17:
-	movq	8(%rsp), %rdx
+.Ltmp19:
+	movq	24(%rsp), %rdx
 	movq	72(%rsp), %rcx
 	movl	144(%rdx,%rcx), %ebp
 	movq	%rbp, %rbx
 	shrq	$5, %rbx
-	movq	(%rsp), %r15
+	movq	8(%rsp), %r15
 	cmpq	64(%r15), %rbx
-	jae	.LBB8_35
+	jae	.LBB7_34
 	movq	48(%r15), %rax
 	testq	%rax, %rax
-	je	.LBB8_35
+	je	.LBB7_34
 	movl	(%rax,%rbx,4), %eax
 	btl	%ebp, %eax
-	jb	.LBB8_29
-.LBB8_35:
+	jb	.LBB7_28
+.LBB7_34:
 	leaq	1(%rbp), %rsi
-.Ltmp18:
+.Ltmp20:
 	movq	160(%rsp), %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp19:
-	movq	%rbp, 48(%rsp)
-	movq	112(%rsp), %rax
+.Ltmp21:
+	movq	%rbp, 16(%rsp)
+	movq	104(%rsp), %rax
 	cmpq	%rbp, (%rax)
-	jbe	.LBB8_37
+	jbe	.LBB7_36
 	movl	$1, %eax
 	movl	%ebp, %ecx
 	shll	%cl, %eax
-	movq	(%rsp), %r15
+	movq	8(%rsp), %r15
 	movq	48(%r15), %rcx
 	orl	%eax, (%rcx,%rbx,4)
 	movq	288(%r15), %rsi
 	cmpq	280(%r15), %rsi
-	jne	.LBB8_42
-.Ltmp20:
+	jne	.LBB7_41
+.Ltmp22:
 	movq	144(%rsp), %rdi
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
-.Ltmp21:
-	movq	(%rsp), %r15
+.Ltmp23:
+	movq	8(%rsp), %r15
 	movq	288(%r15), %rsi
-.LBB8_42:
-	movq	8(%rsp), %rdx
+.LBB7_41:
+	movq	24(%rsp), %rdx
 	movq	72(%rsp), %rcx
 	movq	272(%r15), %rax
 	movl	%ebp, (%rax,%rsi,4)
 	incq	%rsi
 	movq	%rsi, 288(%r15)
-.LBB8_29:
+.LBB7_28:
 	movl	148(%rdx,%rcx), %ebp
 	movq	%rbp, %rbx
 	shrq	$5, %rbx
 	cmpq	32(%r15), %rbx
-	movq	88(%rsp), %r8
-	jae	.LBB8_32
+	movq	120(%rsp), %rsi
+	jae	.LBB7_31
 	movq	16(%r15), %rax
 	testq	%rax, %rax
-	je	.LBB8_32
+	je	.LBB7_31
 	movl	(%rax,%rbx,4), %eax
 	btl	%ebp, %eax
-	jb	.LBB8_47
-.LBB8_32:
+	jb	.LBB7_46
+.LBB7_31:
 	leaq	1(%rbp), %rsi
-.Ltmp22:
+.Ltmp24:
 	movq	152(%rsp), %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp23:
-	movq	%rbp, 48(%rsp)
-	movq	104(%rsp), %rax
+.Ltmp25:
+	movq	%rbp, 16(%rsp)
+	movq	96(%rsp), %rax
 	cmpq	%rbp, (%rax)
-	jbe	.LBB8_34
+	jbe	.LBB7_33
 	movl	$1, %eax
 	movl	%ebp, %ecx
 	shll	%cl, %eax
-	movq	(%rsp), %r15
+	movq	8(%rsp), %r15
 	movq	16(%r15), %rcx
 	orl	%eax, (%rcx,%rbx,4)
 	movq	264(%r15), %rsi
 	cmpq	256(%r15), %rsi
-	jne	.LBB8_46
-.Ltmp27:
+	jne	.LBB7_45
+.Ltmp29:
 	movq	136(%rsp), %rdi
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
-.Ltmp28:
-	jmp	.LBB8_45
-.LBB8_48:
+.Ltmp30:
+	jmp	.LBB7_44
+.LBB7_47:
 	movq	264(%r15), %rdx
 	testq	%rdx, %rdx
-	je	.LBB8_58
-	movq	96(%rsp), %r9
+	je	.LBB7_57
+	movq	88(%rsp), %r9
 	movl	760(%r9), %eax
-	movq	(%rsp), %rdi
+	movq	8(%rsp), %rdi
 	movq	248(%rdi), %rcx
 	leaq	(%rcx,%rdx,4), %rdx
 	movq	296(%rdi), %rsi
@@ -790,12 +778,12 @@ query_state_for_each:
 	xorl	%r10d, %r10d
 	shlq	$4, %rsi
 	shlq	$4, %rdi
-	jmp	.LBB8_51
+	jmp	.LBB7_50
 	.p2align	4, 0x90
-.LBB8_50:
+.LBB7_49:
 	cmpq	%rdx, %rcx
-	je	.LBB8_58
-.LBB8_51:
+	je	.LBB7_57
+.LBB7_50:
 	movl	(%rcx), %r11d
 	addq	$4, %rcx
 	cmpq	%r11, %r9
@@ -804,7 +792,7 @@ query_state_for_each:
 	cmovbeq	%r10, %rbx
 	movq	64(%rbx), %r11
 	testq	%r11, %r11
-	je	.LBB8_50
+	je	.LBB7_49
 	movq	(%rbx), %r15
 	movq	32(%rbx), %r12
 	movq	8(%r12,%rsi), %rbx
@@ -818,7 +806,7 @@ query_state_for_each:
 	movq	16(%r15,%r12), %r15
 	xorl	%r12d, %r12d
 	.p2align	4, 0x90
-.LBB8_53:
+.LBB7_52:
 	movl	%r12d, %r13d
 	shlq	$2, %r13
 	movss	(%r15,%r13), %xmm0
@@ -828,10 +816,10 @@ query_state_for_each:
 	movss	%xmm0, (%rbx,%r13)
 	movq	%rbp, %r12
 	cmpq	%rbp, %r11
-	jne	.LBB8_53
-	jmp	.LBB8_50
-.LBB8_58:
-	movq	(%rsp), %rdi
+	jne	.LBB7_52
+	jmp	.LBB7_49
+.LBB7_57:
+	movq	8(%rsp), %rdi
 	addq	$232, %rsp
 	.cfi_def_cfa_offset 56
 	popq	%rbx
@@ -847,108 +835,97 @@ query_state_for_each:
 	popq	%rbp
 	.cfi_def_cfa_offset 8
 	jmp	core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_for_each::A,&query_state_for_each::B)>>
-.LBB8_7:
+.LBB7_4:
 	.cfi_def_cfa_offset 288
-.Ltmp8:
-	leaq	.Lanon.6dae6fee9a6576153fd5b36d700139f2.14(%rip), %rdx
-	movq	%r8, %rsi
+.Ltmp10:
+	leaq	.Lanon.6dae6fee9a6576153fd5b36d700139f2.9(%rip), %rdx
 	callq	*core::panicking::panic_bounds_check@GOTPCREL(%rip)
-.Ltmp9:
-	jmp	.LBB8_3
-.LBB8_15:
-	leaq	48(%rsp), %rax
-	movq	%rax, 16(%rsp)
+.Ltmp11:
+	jmp	.LBB7_6
+.LBB7_14:
+	leaq	16(%rsp), %rax
+	movq	%rax, 32(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
-	movq	%rax, 24(%rsp)
+	movq	%rax, 40(%rsp)
 	movq	64(%rsp), %rcx
-	jmp	.LBB8_16
-.LBB8_20:
-	leaq	48(%rsp), %rax
-	movq	%rax, 16(%rsp)
+	jmp	.LBB7_15
+.LBB7_19:
+	leaq	16(%rsp), %rax
+	movq	%rax, 32(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
-	movq	%rax, 24(%rsp)
-	movq	120(%rsp), %rcx
-.LBB8_16:
-	movq	%rcx, 32(%rsp)
 	movq	%rax, 40(%rsp)
+	movq	112(%rsp), %rcx
+.LBB7_15:
+	movq	%rcx, 48(%rsp)
+	movq	%rax, 56(%rsp)
 	leaq	.Lanon.6dae6fee9a6576153fd5b36d700139f2.6(%rip), %rax
 	movq	%rax, 184(%rsp)
 	leaq	.Lanon.6dae6fee9a6576153fd5b36d700139f2.7(%rip), %rsi
-	jmp	.LBB8_17
-.LBB8_37:
-	leaq	48(%rsp), %rax
-	movq	%rax, 16(%rsp)
-	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
-	movq	%rax, 24(%rsp)
-	movq	112(%rsp), %rcx
-	jmp	.LBB8_38
-.LBB8_34:
-	leaq	48(%rsp), %rax
-	movq	%rax, 16(%rsp)
+	jmp	.LBB7_16
+.LBB7_36:
+	leaq	16(%rsp), %rax
+	movq	%rax, 32(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
-	movq	%rax, 24(%rsp)
+	movq	%rax, 40(%rsp)
 	movq	104(%rsp), %rcx
-.LBB8_38:
-	movq	%rcx, 32(%rsp)
+	jmp	.LBB7_37
+.LBB7_33:
+	leaq	16(%rsp), %rax
+	movq	%rax, 32(%rsp)
+	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
 	movq	%rax, 40(%rsp)
+	movq	96(%rsp), %rcx
+.LBB7_37:
+	movq	%rcx, 48(%rsp)
+	movq	%rax, 56(%rsp)
 	leaq	.Lanon.6dae6fee9a6576153fd5b36d700139f2.2(%rip), %rax
 	movq	%rax, 184(%rsp)
 	leaq	.Lanon.6dae6fee9a6576153fd5b36d700139f2.4(%rip), %rsi
-.LBB8_17:
-	movl	$2, %eax
-	leaq	16(%rsp), %rcx
-.LBB8_2:
+.LBB7_16:
+	leaq	32(%rsp), %rax
 	leaq	184(%rsp), %rdi
 	movq	$2, 8(%rdi)
 	movq	$0, 32(%rdi)
-	movq	%rcx, 16(%rdi)
-	movq	%rax, 24(%rdi)
-.Ltmp24:
-	movq	(%rsp), %r15
+	movq	%rax, 16(%rdi)
+	movq	$2, 24(%rdi)
+.Ltmp26:
+	movq	8(%rsp), %r15
 	callq	*core::panicking::panic_fmt@GOTPCREL(%rip)
-.Ltmp25:
-.LBB8_3:
+.Ltmp27:
+	jmp	.LBB7_6
+.LBB7_5:
+.Ltmp8:
+	leaq	.Lanon.6dae6fee9a6576153fd5b36d700139f2.10(%rip), %rdx
+	callq	*bevy_ecs::query::state::QueryState<Q,F>::validate_world::panic_mismatched@GOTPCREL(%rip)
+.Ltmp9:
+.LBB7_6:
 	ud2
-.LBB8_1:
-	leaq	.Lanon.6dae6fee9a6576153fd5b36d700139f2.11(%rip), %rax
-	movq	%rax, 16(%rsp)
-	movq	$92, 24(%rsp)
-	leaq	16(%rsp), %rax
-	movq	%rax, 48(%rsp)
-	leaq	<&T as core::fmt::Display>::fmt(%rip), %rax
-	movq	%rax, 56(%rsp)
-	leaq	.Lanon.6dae6fee9a6576153fd5b36d700139f2.10(%rip), %rax
-	movq	%rax, 184(%rsp)
-	leaq	.Lanon.6dae6fee9a6576153fd5b36d700139f2.13(%rip), %rsi
-	movl	$1, %eax
-	leaq	48(%rsp), %rcx
-	jmp	.LBB8_2
-.LBB8_54:
-.Ltmp29:
+.LBB7_53:
+.Ltmp31:
 	movq	%rax, %r14
-	movq	(%rsp), %r15
-	jmp	.LBB8_56
-.LBB8_55:
-.Ltmp26:
+	movq	8(%rsp), %r15
+	jmp	.LBB7_55
+.LBB7_54:
+.Ltmp28:
 	movq	%rax, %r14
-.LBB8_56:
-.Ltmp30:
+.LBB7_55:
+.Ltmp32:
 	movq	%r15, %rdi
 	callq	core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_for_each::A,&query_state_for_each::B)>>
-.Ltmp31:
+.Ltmp33:
 	movq	%r14, %rdi
 	callq	_Unwind_Resume@PLT
 	ud2
-.LBB8_59:
-.Ltmp32:
+.LBB7_58:
+.Ltmp34:
 	callq	*core::panicking::panic_cannot_unwind@GOTPCREL(%rip)
 	ud2
-.Lfunc_end8:
-	.size	query_state_for_each, .Lfunc_end8-query_state_for_each
+.Lfunc_end7:
+	.size	query_state_for_each, .Lfunc_end7-query_state_for_each
 	.cfi_endproc
 	.section	.gcc_except_table.query_state_for_each,"a",@progbits
 	.p2align	2, 0x0
-GCC_except_table8:
+GCC_except_table7:
 .Lexception1:
 	.byte	255
 	.byte	155
@@ -957,24 +934,24 @@ GCC_except_table8:
 	.byte	1
 	.uleb128 .Lcst_end1-.Lcst_begin1
 .Lcst_begin1:
-	.uleb128 .Ltmp10-.Lfunc_begin1
-	.uleb128 .Ltmp28-.Ltmp10
-	.uleb128 .Ltmp29-.Lfunc_begin1
+	.uleb128 .Ltmp12-.Lfunc_begin1
+	.uleb128 .Ltmp30-.Ltmp12
+	.uleb128 .Ltmp31-.Lfunc_begin1
 	.byte	0
-	.uleb128 .Ltmp28-.Lfunc_begin1
-	.uleb128 .Ltmp8-.Ltmp28
+	.uleb128 .Ltmp30-.Lfunc_begin1
+	.uleb128 .Ltmp10-.Ltmp30
 	.byte	0
 	.byte	0
-	.uleb128 .Ltmp8-.Lfunc_begin1
-	.uleb128 .Ltmp25-.Ltmp8
-	.uleb128 .Ltmp26-.Lfunc_begin1
+	.uleb128 .Ltmp10-.Lfunc_begin1
+	.uleb128 .Ltmp9-.Ltmp10
+	.uleb128 .Ltmp28-.Lfunc_begin1
 	.byte	0
-	.uleb128 .Ltmp30-.Lfunc_begin1
-	.uleb128 .Ltmp31-.Ltmp30
 	.uleb128 .Ltmp32-.Lfunc_begin1
+	.uleb128 .Ltmp33-.Ltmp32
+	.uleb128 .Ltmp34-.Lfunc_begin1
 	.byte	1
-	.uleb128 .Ltmp31-.Lfunc_begin1
-	.uleb128 .Lfunc_end8-.Ltmp31
+	.uleb128 .Ltmp33-.Lfunc_begin1
+	.uleb128 .Lfunc_end7-.Ltmp33
 	.byte	0
 	.byte	0
 .Lcst_end1:
@@ -1048,52 +1025,24 @@ GCC_except_table8:
 	.type	.Lanon.6dae6fee9a6576153fd5b36d700139f2.8,@object
 	.section	.rodata..Lanon.6dae6fee9a6576153fd5b36d700139f2.8,"a",@progbits
 .Lanon.6dae6fee9a6576153fd5b36d700139f2.8:
-	.ascii	"Attempted to use "
-	.size	.Lanon.6dae6fee9a6576153fd5b36d700139f2.8, 17
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-41530a2346942c86/c9f9133/crates/bevy_ecs/src/query/state.rs"
+	.size	.Lanon.6dae6fee9a6576153fd5b36d700139f2.8, 97
 
 	.type	.Lanon.6dae6fee9a6576153fd5b36d700139f2.9,@object
-	.section	.rodata..Lanon.6dae6fee9a6576153fd5b36d700139f2.9,"a",@progbits
+	.section	.data.rel.ro..Lanon.6dae6fee9a6576153fd5b36d700139f2.9,"aw",@progbits
+	.p2align	3, 0x0
 .Lanon.6dae6fee9a6576153fd5b36d700139f2.9:
-	.ascii	" with a mismatched World. QueryStates can only be used with the World they were created from."
-	.size	.Lanon.6dae6fee9a6576153fd5b36d700139f2.9, 93
+	.quad	.Lanon.6dae6fee9a6576153fd5b36d700139f2.8
+	.asciz	"a\000\000\000\000\000\000\000\330\000\000\000!\000\000"
+	.size	.Lanon.6dae6fee9a6576153fd5b36d700139f2.9, 24
 
 	.type	.Lanon.6dae6fee9a6576153fd5b36d700139f2.10,@object
 	.section	.data.rel.ro..Lanon.6dae6fee9a6576153fd5b36d700139f2.10,"aw",@progbits
 	.p2align	3, 0x0
 .Lanon.6dae6fee9a6576153fd5b36d700139f2.10:
 	.quad	.Lanon.6dae6fee9a6576153fd5b36d700139f2.8
-	.asciz	"\021\000\000\000\000\000\000"
-	.quad	.Lanon.6dae6fee9a6576153fd5b36d700139f2.9
-	.asciz	"]\000\000\000\000\000\000"
-	.size	.Lanon.6dae6fee9a6576153fd5b36d700139f2.10, 32
-
-	.type	.Lanon.6dae6fee9a6576153fd5b36d700139f2.11,@object
-	.section	.rodata..Lanon.6dae6fee9a6576153fd5b36d700139f2.11,"a",@progbits
-.Lanon.6dae6fee9a6576153fd5b36d700139f2.11:
-	.ascii	"bevy_ecs::query::state::QueryState<(&mut query_state_for_each::A, &query_state_for_each::B)>"
-	.size	.Lanon.6dae6fee9a6576153fd5b36d700139f2.11, 92
-
-	.type	.Lanon.6dae6fee9a6576153fd5b36d700139f2.12,@object
-	.section	.rodata..Lanon.6dae6fee9a6576153fd5b36d700139f2.12,"a",@progbits
-.Lanon.6dae6fee9a6576153fd5b36d700139f2.12:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/0607116/crates/bevy_ecs/src/query/state.rs"
-	.size	.Lanon.6dae6fee9a6576153fd5b36d700139f2.12, 97
-
-	.type	.Lanon.6dae6fee9a6576153fd5b36d700139f2.13,@object
-	.section	.data.rel.ro..Lanon.6dae6fee9a6576153fd5b36d700139f2.13,"aw",@progbits
-	.p2align	3, 0x0
-.Lanon.6dae6fee9a6576153fd5b36d700139f2.13:
-	.quad	.Lanon.6dae6fee9a6576153fd5b36d700139f2.12
-	.asciz	"a\000\000\000\000\000\000\000\344\000\000\000\t\000\000"
-	.size	.Lanon.6dae6fee9a6576153fd5b36d700139f2.13, 24
-
-	.type	.Lanon.6dae6fee9a6576153fd5b36d700139f2.14,@object
-	.section	.data.rel.ro..Lanon.6dae6fee9a6576153fd5b36d700139f2.14,"aw",@progbits
-	.p2align	3, 0x0
-.Lanon.6dae6fee9a6576153fd5b36d700139f2.14:
-	.quad	.Lanon.6dae6fee9a6576153fd5b36d700139f2.12
-	.asciz	"a\000\000\000\000\000\000\000\330\000\000\000!\000\000"
-	.size	.Lanon.6dae6fee9a6576153fd5b36d700139f2.14, 24
+	.asciz	"a\000\000\000\000\000\000\000\321\000\000\000\016\000\000"
+	.size	.Lanon.6dae6fee9a6576153fd5b36d700139f2.10, 24
 
 	.hidden	DW.ref.rust_eh_personality
 	.weak	DW.ref.rust_eh_personality
diff --git a/results/query_state_for_each_sparse.s b/results/query_state_for_each_sparse.s
index 0948eef..b165ffe 100644
--- a/results/query_state_for_each_sparse.s
+++ b/results/query_state_for_each_sparse.s
@@ -1,19 +1,5 @@
 	.text
-	.file	"query_state_for_each_sparse.29c46fadf4d0954c-cgu.0"
-	.section	".text.<&T as core::fmt::Display>::fmt","ax",@progbits
-	.p2align	4, 0x90
-	.type	<&T as core::fmt::Display>::fmt,@function
-<&T as core::fmt::Display>::fmt:
-	.cfi_startproc
-	movq	%rsi, %rdx
-	movq	(%rdi), %rax
-	movq	8(%rdi), %rsi
-	movq	%rax, %rdi
-	jmpq	*<str as core::fmt::Display>::fmt@GOTPCREL(%rip)
-.Lfunc_end0:
-	.size	<&T as core::fmt::Display>::fmt, .Lfunc_end0-<&T as core::fmt::Display>::fmt
-	.cfi_endproc
-
+	.file	"query_state_for_each_sparse.6d9d99475cb59000-cgu.0"
 	.section	".text.core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>","ax",@progbits
 	.p2align	4, 0x90
 	.type	core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>,@function
@@ -37,53 +23,53 @@ core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::compo
 	movq	%rdi, %rbx
 	movq	32(%rdi), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_2
+	je	.LBB0_2
 	movq	24(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB1_2:
+.LBB0_2:
 	movq	64(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_4
+	je	.LBB0_4
 	movq	56(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB1_4:
+.LBB0_4:
 	movq	(%rbx), %r14
 	movq	16(%rbx), %r15
 	testq	%r15, %r15
-	je	.LBB1_11
+	je	.LBB0_11
 	leaq	40(%r14), %r12
 	movq	__rust_dealloc@GOTPCREL(%rip), %r13
-	jmp	.LBB1_6
+	jmp	.LBB0_6
 	.p2align	4, 0x90
-.LBB1_10:
+.LBB0_10:
 	addq	$64, %r12
 	decq	%r15
-	je	.LBB1_11
-.LBB1_6:
+	je	.LBB0_11
+.LBB0_6:
 	movq	-32(%r12), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_8
+	je	.LBB0_8
 	movq	-40(%r12), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*%r13
-.LBB1_8:
+.LBB0_8:
 	movq	(%r12), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_10
+	je	.LBB0_10
 	movq	-8(%r12), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*%r13
-	jmp	.LBB1_10
-.LBB1_11:
+	jmp	.LBB0_10
+.LBB0_11:
 	movq	8(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_12
+	je	.LBB0_12
 	shlq	$6, %rsi
 	movl	$8, %edx
 	movq	%r14, %rdi
@@ -98,7 +84,7 @@ core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::compo
 	popq	%r15
 	.cfi_def_cfa_offset 8
 	jmpq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB1_12:
+.LBB0_12:
 	.cfi_def_cfa_offset 48
 	popq	%rbx
 	.cfi_def_cfa_offset 40
@@ -111,8 +97,8 @@ core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::compo
 	popq	%r15
 	.cfi_def_cfa_offset 8
 	retq
-.Lfunc_end1:
-	.size	core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>, .Lfunc_end1-core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>
+.Lfunc_end0:
+	.size	core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>, .Lfunc_end0-core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>
 	.cfi_endproc
 
 	.section	".text.core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_for_each_sparse::A,&query_state_for_each_sparse::B)>>","ax",@progbits
@@ -134,51 +120,51 @@ core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_fo
 	movq	%rdi, %rbx
 	movq	24(%rdi), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_2
+	je	.LBB1_2
 	movq	16(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_2:
+.LBB1_2:
 	movq	56(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_4
+	je	.LBB1_4
 	movq	48(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_4:
+.LBB1_4:
 	movq	88(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_6
+	je	.LBB1_6
 	movq	80(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_6:
+.LBB1_6:
 	movq	120(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_8
+	je	.LBB1_8
 	movq	112(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_8:
+.LBB1_8:
 	leaq	152(%rbx), %rdi
 .Ltmp0:
 	callq	core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>
 .Ltmp1:
 	movq	256(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_11
+	je	.LBB1_11
 	movq	248(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_11:
+.LBB1_11:
 	movq	280(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_16
+	je	.LBB1_16
 	movq	272(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
@@ -189,7 +175,7 @@ core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_fo
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	jmpq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_16:
+.LBB1_16:
 	.cfi_def_cfa_offset 32
 	addq	$8, %rsp
 	.cfi_def_cfa_offset 24
@@ -198,7 +184,7 @@ core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_fo
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB2_13:
+.LBB1_13:
 	.cfi_def_cfa_offset 32
 .Ltmp2:
 	movq	%rax, %r14
@@ -215,16 +201,16 @@ core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_fo
 	movq	%r14, %rdi
 	callq	_Unwind_Resume@PLT
 	ud2
-.LBB2_17:
+.LBB1_17:
 .Ltmp7:
 	callq	*core::panicking::panic_cannot_unwind@GOTPCREL(%rip)
 	ud2
-.Lfunc_end2:
-	.size	core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_for_each_sparse::A,&query_state_for_each_sparse::B)>>, .Lfunc_end2-core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_for_each_sparse::A,&query_state_for_each_sparse::B)>>
+.Lfunc_end1:
+	.size	core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_for_each_sparse::A,&query_state_for_each_sparse::B)>>, .Lfunc_end1-core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_for_each_sparse::A,&query_state_for_each_sparse::B)>>
 	.cfi_endproc
 	.section	".gcc_except_table.core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_for_each_sparse::A,&query_state_for_each_sparse::B)>>","a",@progbits
 	.p2align	2, 0x0
-GCC_except_table2:
+GCC_except_table1:
 .Lexception0:
 	.byte	255
 	.byte	155
@@ -242,7 +228,7 @@ GCC_except_table2:
 	.uleb128 .Ltmp7-.Lfunc_begin0
 	.byte	1
 	.uleb128 .Ltmp6-.Lfunc_begin0
-	.uleb128 .Lfunc_end2-.Ltmp6
+	.uleb128 .Lfunc_end1-.Ltmp6
 	.byte	0
 	.byte	0
 .Lcst_end0:
@@ -259,14 +245,14 @@ GCC_except_table2:
 core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>:
 	.cfi_startproc
 	testq	%rsi, %rsi
-	je	.LBB3_1
+	je	.LBB2_1
 	shlq	$2, %rsi
 	movl	$4, %edx
 	jmpq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB3_1:
+.LBB2_1:
 	retq
-.Lfunc_end3:
-	.size	core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>, .Lfunc_end3-core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>
+.Lfunc_end2:
+	.size	core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>, .Lfunc_end2-core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>
 	.cfi_endproc
 
 	.section	".text.core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>","ax",@progbits
@@ -275,14 +261,14 @@ core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>:
 core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>:
 	.cfi_startproc
 	testq	%rsi, %rsi
-	je	.LBB4_1
+	je	.LBB3_1
 	shlq	$2, %rsi
 	movl	$4, %edx
 	jmpq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB4_1:
+.LBB3_1:
 	retq
-.Lfunc_end4:
-	.size	core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>, .Lfunc_end4-core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>
+.Lfunc_end3:
+	.size	core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>, .Lfunc_end3-core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>
 	.cfi_endproc
 
 	.section	.text.alloc::raw_vec::finish_grow,"ax",@progbits
@@ -302,41 +288,41 @@ alloc::raw_vec::finish_grow:
 	movq	%rdx, %rbx
 	movq	%rdi, %r14
 	testq	%rsi, %rsi
-	je	.LBB5_6
+	je	.LBB4_6
 	movq	%rsi, %r15
 	cmpq	$0, 8(%rcx)
-	je	.LBB5_7
+	je	.LBB4_7
 	movq	16(%rcx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB5_7
+	je	.LBB4_7
 	movq	(%rcx), %rdi
 	movq	%r15, %rdx
 	movq	%rbx, %rcx
 	callq	*__rust_realloc@GOTPCREL(%rip)
 	testq	%rax, %rax
-	jne	.LBB5_11
-.LBB5_4:
+	jne	.LBB4_11
+.LBB4_4:
 	movq	%r15, 8(%r14)
-	jmp	.LBB5_5
-.LBB5_7:
+	jmp	.LBB4_5
+.LBB4_7:
 	testq	%rbx, %rbx
-	je	.LBB5_8
+	je	.LBB4_8
 	movq	__rust_no_alloc_shim_is_unstable@GOTPCREL(%rip), %rax
 	movzbl	(%rax), %eax
 	movq	%rbx, %rdi
 	movq	%r15, %rsi
 	callq	*__rust_alloc@GOTPCREL(%rip)
 	testq	%rax, %rax
-	je	.LBB5_4
-.LBB5_11:
+	je	.LBB4_4
+.LBB4_11:
 	movq	%rax, 8(%r14)
 	xorl	%eax, %eax
-	jmp	.LBB5_12
-.LBB5_6:
+	jmp	.LBB4_12
+.LBB4_6:
 	movq	$0, 8(%r14)
-.LBB5_5:
+.LBB4_5:
 	movl	$1, %eax
-.LBB5_12:
+.LBB4_12:
 	movq	%rbx, 16(%r14)
 	movq	%rax, (%r14)
 	popq	%rbx
@@ -346,14 +332,14 @@ alloc::raw_vec::finish_grow:
 	popq	%r15
 	.cfi_def_cfa_offset 8
 	retq
-.LBB5_8:
+.LBB4_8:
 	.cfi_def_cfa_offset 32
 	movq	%r15, %rax
 	testq	%rax, %rax
-	jne	.LBB5_11
-	jmp	.LBB5_4
-.Lfunc_end5:
-	.size	alloc::raw_vec::finish_grow, .Lfunc_end5-alloc::raw_vec::finish_grow
+	jne	.LBB4_11
+	jmp	.LBB4_4
+.Lfunc_end4:
+	.size	alloc::raw_vec::finish_grow, .Lfunc_end4-alloc::raw_vec::finish_grow
 	.cfi_endproc
 
 	.section	".text.alloc::raw_vec::RawVec<T,A>::reserve_for_push","ax",@progbits
@@ -370,7 +356,7 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	.cfi_offset %rbx, -24
 	.cfi_offset %r14, -16
 	incq	%rsi
-	je	.LBB6_10
+	je	.LBB5_10
 	movq	%rdi, %rbx
 	movq	8(%rdi), %rax
 	leaq	(%rax,%rax), %rcx
@@ -386,25 +372,25 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	leaq	(,%r14,4), %rdx
 	shlq	$2, %rsi
 	testq	%rax, %rax
-	je	.LBB6_3
+	je	.LBB5_3
 	movq	(%rbx), %rcx
 	shlq	$2, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$4, 16(%rsp)
 	movq	%rax, 24(%rsp)
-	jmp	.LBB6_4
-.LBB6_3:
+	jmp	.LBB5_4
+.LBB5_3:
 	movq	$0, 16(%rsp)
-.LBB6_4:
+.LBB5_4:
 	leaq	32(%rsp), %rdi
 	leaq	8(%rsp), %rcx
 	callq	alloc::raw_vec::finish_grow
 	cmpq	$0, 32(%rsp)
 	movq	40(%rsp), %rdi
-	je	.LBB6_5
+	je	.LBB5_5
 	movabsq	$-9223372036854775807, %rax
 	cmpq	%rax, %rdi
-	jne	.LBB6_8
+	jne	.LBB5_8
 	addq	$56, %rsp
 	.cfi_def_cfa_offset 24
 	popq	%rbx
@@ -412,7 +398,7 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB6_5:
+.LBB5_5:
 	.cfi_def_cfa_offset 80
 	movq	%rdi, (%rbx)
 	movq	%r14, 8(%rbx)
@@ -423,19 +409,19 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB6_8:
+.LBB5_8:
 	.cfi_def_cfa_offset 80
 	testq	%rdi, %rdi
-	jne	.LBB6_9
-.LBB6_10:
+	jne	.LBB5_9
+.LBB5_10:
 	callq	*alloc::raw_vec::capacity_overflow@GOTPCREL(%rip)
 	ud2
-.LBB6_9:
+.LBB5_9:
 	movq	48(%rsp), %rsi
 	callq	*alloc::alloc::handle_alloc_error@GOTPCREL(%rip)
 	ud2
-.Lfunc_end6:
-	.size	alloc::raw_vec::RawVec<T,A>::reserve_for_push, .Lfunc_end6-alloc::raw_vec::RawVec<T,A>::reserve_for_push
+.Lfunc_end5:
+	.size	alloc::raw_vec::RawVec<T,A>::reserve_for_push, .Lfunc_end5-alloc::raw_vec::RawVec<T,A>::reserve_for_push
 	.cfi_endproc
 
 	.section	".text.alloc::raw_vec::RawVec<T,A>::reserve_for_push","ax",@progbits
@@ -452,7 +438,7 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	.cfi_offset %rbx, -24
 	.cfi_offset %r14, -16
 	incq	%rsi
-	je	.LBB7_10
+	je	.LBB6_10
 	movq	%rdi, %rbx
 	movq	8(%rdi), %rax
 	leaq	(%rax,%rax), %rcx
@@ -468,25 +454,25 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	leaq	(,%r14,4), %rdx
 	shlq	$2, %rsi
 	testq	%rax, %rax
-	je	.LBB7_3
+	je	.LBB6_3
 	movq	(%rbx), %rcx
 	shlq	$2, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$4, 16(%rsp)
 	movq	%rax, 24(%rsp)
-	jmp	.LBB7_4
-.LBB7_3:
+	jmp	.LBB6_4
+.LBB6_3:
 	movq	$0, 16(%rsp)
-.LBB7_4:
+.LBB6_4:
 	leaq	32(%rsp), %rdi
 	leaq	8(%rsp), %rcx
 	callq	alloc::raw_vec::finish_grow
 	cmpq	$0, 32(%rsp)
 	movq	40(%rsp), %rdi
-	je	.LBB7_5
+	je	.LBB6_5
 	movabsq	$-9223372036854775807, %rax
 	cmpq	%rax, %rdi
-	jne	.LBB7_8
+	jne	.LBB6_8
 	addq	$56, %rsp
 	.cfi_def_cfa_offset 24
 	popq	%rbx
@@ -494,7 +480,7 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB7_5:
+.LBB6_5:
 	.cfi_def_cfa_offset 80
 	movq	%rdi, (%rbx)
 	movq	%r14, 8(%rbx)
@@ -505,19 +491,19 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB7_8:
+.LBB6_8:
 	.cfi_def_cfa_offset 80
 	testq	%rdi, %rdi
-	jne	.LBB7_9
-.LBB7_10:
+	jne	.LBB6_9
+.LBB6_10:
 	callq	*alloc::raw_vec::capacity_overflow@GOTPCREL(%rip)
 	ud2
-.LBB7_9:
+.LBB6_9:
 	movq	48(%rsp), %rsi
 	callq	*alloc::alloc::handle_alloc_error@GOTPCREL(%rip)
 	ud2
-.Lfunc_end7:
-	.size	alloc::raw_vec::RawVec<T,A>::reserve_for_push, .Lfunc_end7-alloc::raw_vec::RawVec<T,A>::reserve_for_push
+.Lfunc_end6:
+	.size	alloc::raw_vec::RawVec<T,A>::reserve_for_push, .Lfunc_end6-alloc::raw_vec::RawVec<T,A>::reserve_for_push
 	.cfi_endproc
 
 	.section	.text.query_for_each,"ax",@progbits
@@ -549,18 +535,20 @@ query_for_each:
 	.cfi_offset %r14, -32
 	.cfi_offset %r15, -24
 	.cfi_offset %rbp, -16
-	movq	(%rdi), %rax
-	cmpq	752(%rsi), %rax
-	movq	%rdi, (%rsp)
-	jne	.LBB8_1
+	movq	%rsi, %rax
 	movq	%rdi, %r13
-	movq	%rsi, 112(%rsp)
-	movq	168(%rsi), %rsi
-	movq	8(%rdi), %r15
-	movq	%rsi, 8(%rdi)
+	movq	752(%rsi), %rsi
+	movq	(%rdi), %rdi
+	cmpq	%rsi, %rdi
+	jne	.LBB7_5
+	movq	%rax, 112(%rsp)
+	movq	168(%rax), %rsi
+	movq	8(%r13), %r15
+	movq	%rsi, 8(%r13)
 	cmpq	%rsi, %r15
+	movq	%r13, 8(%rsp)
 	movq	%rsi, 88(%rsp)
-	jae	.LBB8_48
+	jae	.LBB7_47
 	leaq	80(%r13), %rcx
 	leaq	104(%r13), %rax
 	movq	%rax, 64(%rsp)
@@ -584,47 +572,47 @@ query_for_each:
 	movq	%rax, 136(%rsp)
 	movq	112(%rsp), %rax
 	movq	152(%rax), %rax
-	movq	%rax, 8(%rsp)
+	movq	%rax, 24(%rsp)
 	movq	%rcx, 72(%rsp)
-	jmp	.LBB8_6
-.LBB8_45:
-	movq	(%rsp), %r13
+	jmp	.LBB7_3
+.LBB7_44:
+	movq	8(%rsp), %r13
 	movq	264(%r13), %rsi
-.LBB8_46:
+.LBB7_45:
 	movq	248(%r13), %rax
 	movl	%ebp, (%rax,%rsi,4)
 	incq	%rsi
 	movq	%rsi, 264(%r13)
 	movq	88(%rsp), %rsi
 	.p2align	4, 0x90
-.LBB8_47:
+.LBB7_46:
 	incq	%r15
 	cmpq	%r15, %rsi
-	je	.LBB8_48
-.LBB8_6:
+	je	.LBB7_47
+.LBB7_3:
 	movl	%r15d, %edi
 	cmpq	%rsi, %rdi
-	jae	.LBB8_7
+	jae	.LBB7_4
 	imulq	$152, %rdi, %rdi
 	movq	296(%r13), %rax
-	movq	8(%rsp), %rcx
+	movq	24(%rsp), %rcx
 	movq	136(%rcx,%rdi), %rcx
 	cmpq	%rax, %rcx
-	jbe	.LBB8_47
-	movq	8(%rsp), %rdx
+	jbe	.LBB7_46
+	movq	24(%rsp), %rdx
 	movq	128(%rdx,%rdi), %r14
 	testq	%r14, %r14
-	je	.LBB8_47
+	je	.LBB7_46
 	shlq	$4, %rax
 	cmpq	$0, (%r14,%rax)
-	je	.LBB8_47
+	je	.LBB7_46
 	movq	304(%r13), %r12
 	cmpq	%r12, %rcx
-	jbe	.LBB8_47
+	jbe	.LBB7_46
 	shlq	$4, %r12
 	cmpq	$0, (%r14,%r12)
-	je	.LBB8_47
-	movq	8(%rsp), %rcx
+	je	.LBB7_46
+	movq	24(%rsp), %rcx
 	movq	%rdi, 80(%rsp)
 	movq	96(%rcx,%rdi), %rcx
 	movq	8(%r14,%rax), %rax
@@ -632,15 +620,15 @@ query_for_each:
 	movq	%rcx, 176(%rsp)
 	movq	(%rcx,%rax), %r13
 	leaq	1(%r13), %rbx
-.Ltmp10:
+.Ltmp12:
 	movq	72(%rsp), %rdi
 	movq	%rbx, %rsi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp11:
-	movq	%r13, 48(%rsp)
+.Ltmp13:
+	movq	%r13, 16(%rsp)
 	movq	64(%rsp), %rax
 	cmpq	%r13, (%rax)
-	jbe	.LBB8_15
+	jbe	.LBB7_14
 	movq	%rbx, %rsi
 	movq	%r13, %rbp
 	shrq	$5, %rbp
@@ -650,34 +638,34 @@ query_for_each:
 	movq	72(%rsp), %rax
 	movq	(%rax), %rax
 	orl	%ebx, (%rax,%rbp,4)
-.Ltmp12:
+.Ltmp14:
 	movq	128(%rsp), %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp13:
-	movq	%r13, 48(%rsp)
+.Ltmp15:
+	movq	%r13, 16(%rsp)
 	movq	120(%rsp), %rax
 	cmpq	%r13, (%rax)
-	jbe	.LBB8_20
+	jbe	.LBB7_19
 	movq	128(%rsp), %rax
 	movq	(%rax), %rax
 	orl	%ebx, (%rax,%rbp,4)
 	leaq	(%r14,%r12), %rax
 	cmpq	$0, (%rax)
 	movq	72(%rsp), %rdx
-	je	.LBB8_25
+	je	.LBB7_24
 	movq	8(%r14,%r12), %rax
 	shlq	$4, %rax
 	movq	176(%rsp), %rcx
 	movq	(%rcx,%rax), %r13
 	leaq	1(%r13), %rsi
-.Ltmp14:
+.Ltmp16:
 	movq	%rdx, %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp15:
-	movq	%r13, 48(%rsp)
+.Ltmp17:
+	movq	%r13, 16(%rsp)
 	movq	64(%rsp), %rax
 	cmpq	%r13, (%rax)
-	jbe	.LBB8_15
+	jbe	.LBB7_14
 	movl	$1, %eax
 	movl	%r13d, %ecx
 	shll	%cl, %eax
@@ -685,98 +673,98 @@ query_for_each:
 	movq	(%rdx), %rcx
 	shrq	$5, %r13
 	orl	%eax, (%rcx,%r13,4)
-.LBB8_25:
-.Ltmp16:
-	movq	8(%rsp), %rax
+.LBB7_24:
+.Ltmp18:
+	movq	24(%rsp), %rax
 	movq	80(%rsp), %rcx
 	leaq	(%rax,%rcx), %rsi
 	movq	168(%rsp), %rdi
 	callq	*<() as bevy_ecs::query::fetch::WorldQuery>::update_archetype_component_access@GOTPCREL(%rip)
-.Ltmp17:
-	movq	8(%rsp), %rax
+.Ltmp19:
+	movq	24(%rsp), %rax
 	movq	80(%rsp), %rcx
 	movl	144(%rax,%rcx), %ebp
 	movq	%rbp, %r14
 	shrq	$5, %r14
-	movq	(%rsp), %r13
+	movq	8(%rsp), %r13
 	cmpq	64(%r13), %r14
-	jae	.LBB8_35
+	jae	.LBB7_34
 	movq	48(%r13), %rax
 	testq	%rax, %rax
-	je	.LBB8_35
+	je	.LBB7_34
 	movl	(%rax,%r14,4), %eax
 	btl	%ebp, %eax
-	jb	.LBB8_29
-.LBB8_35:
+	jb	.LBB7_28
+.LBB7_34:
 	leaq	1(%rbp), %rsi
-.Ltmp18:
+.Ltmp20:
 	movq	160(%rsp), %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp19:
-	movq	%rbp, 48(%rsp)
+.Ltmp21:
+	movq	%rbp, 16(%rsp)
 	movq	104(%rsp), %rax
 	cmpq	%rbp, (%rax)
-	jbe	.LBB8_37
+	jbe	.LBB7_36
 	movl	$1, %eax
 	movl	%ebp, %ecx
 	shll	%cl, %eax
-	movq	(%rsp), %r13
+	movq	8(%rsp), %r13
 	movq	48(%r13), %rcx
 	orl	%eax, (%rcx,%r14,4)
 	movq	288(%r13), %rsi
 	cmpq	280(%r13), %rsi
-	jne	.LBB8_42
-.Ltmp20:
+	jne	.LBB7_41
+.Ltmp22:
 	movq	144(%rsp), %rdi
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
-.Ltmp21:
-	movq	(%rsp), %r13
+.Ltmp23:
+	movq	8(%rsp), %r13
 	movq	288(%r13), %rsi
-.LBB8_42:
+.LBB7_41:
 	movq	272(%r13), %rax
 	movl	%ebp, (%rax,%rsi,4)
 	incq	%rsi
 	movq	%rsi, 288(%r13)
 	movq	80(%rsp), %rcx
-.LBB8_29:
-	movq	8(%rsp), %rax
+.LBB7_28:
+	movq	24(%rsp), %rax
 	movl	148(%rax,%rcx), %ebp
 	movq	%rbp, %rbx
 	shrq	$5, %rbx
 	cmpq	32(%r13), %rbx
 	movq	88(%rsp), %rsi
-	jae	.LBB8_32
+	jae	.LBB7_31
 	movq	16(%r13), %rax
 	testq	%rax, %rax
-	je	.LBB8_32
+	je	.LBB7_31
 	movl	(%rax,%rbx,4), %eax
 	btl	%ebp, %eax
-	jb	.LBB8_47
-.LBB8_32:
+	jb	.LBB7_46
+.LBB7_31:
 	leaq	1(%rbp), %rsi
-.Ltmp22:
+.Ltmp24:
 	movq	152(%rsp), %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp23:
-	movq	%rbp, 48(%rsp)
+.Ltmp25:
+	movq	%rbp, 16(%rsp)
 	movq	96(%rsp), %rax
 	cmpq	%rbp, (%rax)
-	jbe	.LBB8_34
+	jbe	.LBB7_33
 	movl	$1, %eax
 	movl	%ebp, %ecx
 	shll	%cl, %eax
-	movq	(%rsp), %r13
+	movq	8(%rsp), %r13
 	movq	16(%r13), %rcx
 	orl	%eax, (%rcx,%rbx,4)
 	movq	264(%r13), %rsi
 	cmpq	256(%r13), %rsi
-	jne	.LBB8_46
-.Ltmp27:
+	jne	.LBB7_45
+.Ltmp29:
 	movq	136(%rsp), %rdi
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
-.Ltmp28:
-	jmp	.LBB8_45
-.LBB8_48:
+.Ltmp30:
+	jmp	.LBB7_44
+.LBB7_47:
 	movq	296(%r13), %rcx
 	movq	304(%r13), %rdx
 	movq	112(%rsp), %r8
@@ -784,54 +772,54 @@ query_for_each:
 	movq	280(%r8), %rdi
 	xorl	%eax, %eax
 	cmpq	%rcx, %rdi
-	jbe	.LBB8_53
+	jbe	.LBB7_52
 	testq	%rsi, %rsi
-	je	.LBB8_53
+	je	.LBB7_52
 	shlq	$4, %rcx
 	cmpq	$0, (%rsi,%rcx)
-	je	.LBB8_51
+	je	.LBB7_50
 	movq	8(%rsi,%rcx), %rax
 	leaq	(%rax,%rax,8), %rax
 	shlq	$4, %rax
 	addq	216(%r8), %rax
-.LBB8_53:
+.LBB7_52:
 	xorl	%ecx, %ecx
 	cmpq	%rdx, %rdi
-	jbe	.LBB8_58
-.LBB8_54:
+	jbe	.LBB7_57
+.LBB7_53:
 	testq	%rsi, %rsi
-	je	.LBB8_58
+	je	.LBB7_57
 	shlq	$4, %rdx
 	cmpq	$0, (%rsi,%rdx)
-	je	.LBB8_56
+	je	.LBB7_55
 	movq	8(%rsi,%rdx), %rcx
 	leaq	(%rcx,%rcx,8), %rcx
 	shlq	$4, %rcx
 	addq	216(%r8), %rcx
-	jmp	.LBB8_58
-.LBB8_51:
+	jmp	.LBB7_57
+.LBB7_50:
 	xorl	%eax, %eax
 	xorl	%ecx, %ecx
 	cmpq	%rdx, %rdi
-	ja	.LBB8_54
-	jmp	.LBB8_58
-.LBB8_56:
+	ja	.LBB7_53
+	jmp	.LBB7_57
+.LBB7_55:
 	xorl	%ecx, %ecx
-.LBB8_58:
+.LBB7_57:
 	movq	288(%r13), %rdi
 	testq	%rdi, %rdi
-	je	.LBB8_68
+	je	.LBB7_67
 	movl	760(%r8), %edx
-	movq	(%rsp), %rsi
+	movq	8(%rsp), %rsi
 	movq	272(%rsi), %rsi
 	leaq	(%rsi,%rdi,4), %rdi
 	movq	152(%r8), %r8
-	jmp	.LBB8_61
+	jmp	.LBB7_60
 	.p2align	4, 0x90
-.LBB8_60:
+.LBB7_59:
 	cmpq	%rdi, %rsi
-	je	.LBB8_68
-.LBB8_61:
+	je	.LBB7_67
+.LBB7_60:
 	movl	(%rsi), %r10d
 	addq	$4, %rsi
 	imulq	$152, %r10, %r11
@@ -841,11 +829,11 @@ query_for_each:
 	cmovbeq	%r9, %r11
 	movq	88(%r11), %r10
 	testq	%r10, %r10
-	je	.LBB8_60
+	je	.LBB7_59
 	movq	72(%r11), %r11
 	addq	$4, %r11
 	.p2align	4, 0x90
-.LBB8_63:
+.LBB7_62:
 	movl	(%r11), %ebx
 	movq	120(%rax), %r14
 	movl	4(%r14,%rbx,8), %r14d
@@ -863,10 +851,10 @@ query_for_each:
 	movss	%xmm0, (%r12,%r15)
 	addq	$12, %r11
 	decq	%r10
-	jne	.LBB8_63
-	jmp	.LBB8_60
-.LBB8_68:
-	movq	(%rsp), %rdi
+	jne	.LBB7_62
+	jmp	.LBB7_59
+.LBB7_67:
+	movq	8(%rsp), %rdi
 	addq	$232, %rsp
 	.cfi_def_cfa_offset 56
 	popq	%rbx
@@ -882,107 +870,97 @@ query_for_each:
 	popq	%rbp
 	.cfi_def_cfa_offset 8
 	jmp	core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_for_each_sparse::A,&query_state_for_each_sparse::B)>>
-.LBB8_7:
+.LBB7_4:
 	.cfi_def_cfa_offset 288
-.Ltmp8:
-	leaq	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.14(%rip), %rdx
+.Ltmp10:
+	leaq	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.9(%rip), %rdx
 	callq	*core::panicking::panic_bounds_check@GOTPCREL(%rip)
-.Ltmp9:
-	jmp	.LBB8_3
-.LBB8_15:
-	leaq	48(%rsp), %rax
-	movq	%rax, 16(%rsp)
+.Ltmp11:
+	jmp	.LBB7_6
+.LBB7_14:
+	leaq	16(%rsp), %rax
+	movq	%rax, 32(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
-	movq	%rax, 24(%rsp)
+	movq	%rax, 40(%rsp)
 	movq	64(%rsp), %rcx
-	jmp	.LBB8_16
-.LBB8_20:
-	leaq	48(%rsp), %rax
-	movq	%rax, 16(%rsp)
+	jmp	.LBB7_15
+.LBB7_19:
+	leaq	16(%rsp), %rax
+	movq	%rax, 32(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
-	movq	%rax, 24(%rsp)
-	movq	120(%rsp), %rcx
-.LBB8_16:
-	movq	%rcx, 32(%rsp)
 	movq	%rax, 40(%rsp)
+	movq	120(%rsp), %rcx
+.LBB7_15:
+	movq	%rcx, 48(%rsp)
+	movq	%rax, 56(%rsp)
 	leaq	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.6(%rip), %rax
 	movq	%rax, 184(%rsp)
 	leaq	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.7(%rip), %rsi
-	jmp	.LBB8_17
-.LBB8_37:
-	leaq	48(%rsp), %rax
-	movq	%rax, 16(%rsp)
+	jmp	.LBB7_16
+.LBB7_36:
+	leaq	16(%rsp), %rax
+	movq	%rax, 32(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
-	movq	%rax, 24(%rsp)
+	movq	%rax, 40(%rsp)
 	movq	104(%rsp), %rcx
-	jmp	.LBB8_38
-.LBB8_34:
-	leaq	48(%rsp), %rax
-	movq	%rax, 16(%rsp)
+	jmp	.LBB7_37
+.LBB7_33:
+	leaq	16(%rsp), %rax
+	movq	%rax, 32(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
-	movq	%rax, 24(%rsp)
-	movq	96(%rsp), %rcx
-.LBB8_38:
-	movq	%rcx, 32(%rsp)
 	movq	%rax, 40(%rsp)
+	movq	96(%rsp), %rcx
+.LBB7_37:
+	movq	%rcx, 48(%rsp)
+	movq	%rax, 56(%rsp)
 	leaq	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.2(%rip), %rax
 	movq	%rax, 184(%rsp)
 	leaq	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.4(%rip), %rsi
-.LBB8_17:
-	movl	$2, %eax
-	leaq	16(%rsp), %rcx
-.LBB8_2:
+.LBB7_16:
+	leaq	32(%rsp), %rax
 	leaq	184(%rsp), %rdi
 	movq	$2, 8(%rdi)
 	movq	$0, 32(%rdi)
-	movq	%rcx, 16(%rdi)
-	movq	%rax, 24(%rdi)
-.Ltmp24:
-	movq	(%rsp), %r13
+	movq	%rax, 16(%rdi)
+	movq	$2, 24(%rdi)
+.Ltmp26:
+	movq	8(%rsp), %r13
 	callq	*core::panicking::panic_fmt@GOTPCREL(%rip)
-.Ltmp25:
-.LBB8_3:
+.Ltmp27:
+	jmp	.LBB7_6
+.LBB7_5:
+.Ltmp8:
+	leaq	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.10(%rip), %rdx
+	callq	*bevy_ecs::query::state::QueryState<Q,F>::validate_world::panic_mismatched@GOTPCREL(%rip)
+.Ltmp9:
+.LBB7_6:
 	ud2
-.LBB8_1:
-	leaq	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.11(%rip), %rax
-	movq	%rax, 16(%rsp)
-	movq	$106, 24(%rsp)
-	leaq	16(%rsp), %rax
-	movq	%rax, 48(%rsp)
-	leaq	<&T as core::fmt::Display>::fmt(%rip), %rax
-	movq	%rax, 56(%rsp)
-	leaq	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.10(%rip), %rax
-	movq	%rax, 184(%rsp)
-	leaq	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.13(%rip), %rsi
-	movl	$1, %eax
-	leaq	48(%rsp), %rcx
-	jmp	.LBB8_2
-.LBB8_64:
-.Ltmp29:
+.LBB7_63:
+.Ltmp31:
 	movq	%rax, %r14
-	movq	(%rsp), %r13
-	jmp	.LBB8_66
-.LBB8_65:
-.Ltmp26:
+	movq	8(%rsp), %r13
+	jmp	.LBB7_65
+.LBB7_64:
+.Ltmp28:
 	movq	%rax, %r14
-.LBB8_66:
-.Ltmp30:
+.LBB7_65:
+.Ltmp32:
 	movq	%r13, %rdi
 	callq	core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_for_each_sparse::A,&query_state_for_each_sparse::B)>>
-.Ltmp31:
+.Ltmp33:
 	movq	%r14, %rdi
 	callq	_Unwind_Resume@PLT
 	ud2
-.LBB8_69:
-.Ltmp32:
+.LBB7_68:
+.Ltmp34:
 	callq	*core::panicking::panic_cannot_unwind@GOTPCREL(%rip)
 	ud2
-.Lfunc_end8:
-	.size	query_for_each, .Lfunc_end8-query_for_each
+.Lfunc_end7:
+	.size	query_for_each, .Lfunc_end7-query_for_each
 	.cfi_endproc
 	.section	.gcc_except_table.query_for_each,"a",@progbits
 	.p2align	2, 0x0
-GCC_except_table8:
+GCC_except_table7:
 .Lexception1:
 	.byte	255
 	.byte	155
@@ -991,24 +969,24 @@ GCC_except_table8:
 	.byte	1
 	.uleb128 .Lcst_end1-.Lcst_begin1
 .Lcst_begin1:
-	.uleb128 .Ltmp10-.Lfunc_begin1
-	.uleb128 .Ltmp28-.Ltmp10
-	.uleb128 .Ltmp29-.Lfunc_begin1
+	.uleb128 .Ltmp12-.Lfunc_begin1
+	.uleb128 .Ltmp30-.Ltmp12
+	.uleb128 .Ltmp31-.Lfunc_begin1
 	.byte	0
-	.uleb128 .Ltmp28-.Lfunc_begin1
-	.uleb128 .Ltmp8-.Ltmp28
+	.uleb128 .Ltmp30-.Lfunc_begin1
+	.uleb128 .Ltmp10-.Ltmp30
 	.byte	0
 	.byte	0
-	.uleb128 .Ltmp8-.Lfunc_begin1
-	.uleb128 .Ltmp25-.Ltmp8
-	.uleb128 .Ltmp26-.Lfunc_begin1
+	.uleb128 .Ltmp10-.Lfunc_begin1
+	.uleb128 .Ltmp9-.Ltmp10
+	.uleb128 .Ltmp28-.Lfunc_begin1
 	.byte	0
-	.uleb128 .Ltmp30-.Lfunc_begin1
-	.uleb128 .Ltmp31-.Ltmp30
 	.uleb128 .Ltmp32-.Lfunc_begin1
+	.uleb128 .Ltmp33-.Ltmp32
+	.uleb128 .Ltmp34-.Lfunc_begin1
 	.byte	1
-	.uleb128 .Ltmp31-.Lfunc_begin1
-	.uleb128 .Lfunc_end8-.Ltmp31
+	.uleb128 .Ltmp33-.Lfunc_begin1
+	.uleb128 .Lfunc_end7-.Ltmp33
 	.byte	0
 	.byte	0
 .Lcst_end1:
@@ -1082,52 +1060,24 @@ GCC_except_table8:
 	.type	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.8,@object
 	.section	.rodata..Lanon.0d252a227dcf2249288cd9db6e2d5b21.8,"a",@progbits
 .Lanon.0d252a227dcf2249288cd9db6e2d5b21.8:
-	.ascii	"Attempted to use "
-	.size	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.8, 17
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-41530a2346942c86/c9f9133/crates/bevy_ecs/src/query/state.rs"
+	.size	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.8, 97
 
 	.type	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.9,@object
-	.section	.rodata..Lanon.0d252a227dcf2249288cd9db6e2d5b21.9,"a",@progbits
+	.section	.data.rel.ro..Lanon.0d252a227dcf2249288cd9db6e2d5b21.9,"aw",@progbits
+	.p2align	3, 0x0
 .Lanon.0d252a227dcf2249288cd9db6e2d5b21.9:
-	.ascii	" with a mismatched World. QueryStates can only be used with the World they were created from."
-	.size	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.9, 93
+	.quad	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.8
+	.asciz	"a\000\000\000\000\000\000\000\330\000\000\000!\000\000"
+	.size	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.9, 24
 
 	.type	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.10,@object
 	.section	.data.rel.ro..Lanon.0d252a227dcf2249288cd9db6e2d5b21.10,"aw",@progbits
 	.p2align	3, 0x0
 .Lanon.0d252a227dcf2249288cd9db6e2d5b21.10:
 	.quad	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.8
-	.asciz	"\021\000\000\000\000\000\000"
-	.quad	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.9
-	.asciz	"]\000\000\000\000\000\000"
-	.size	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.10, 32
-
-	.type	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.11,@object
-	.section	.rodata..Lanon.0d252a227dcf2249288cd9db6e2d5b21.11,"a",@progbits
-.Lanon.0d252a227dcf2249288cd9db6e2d5b21.11:
-	.ascii	"bevy_ecs::query::state::QueryState<(&mut query_state_for_each_sparse::A, &query_state_for_each_sparse::B)>"
-	.size	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.11, 106
-
-	.type	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.12,@object
-	.section	.rodata..Lanon.0d252a227dcf2249288cd9db6e2d5b21.12,"a",@progbits
-.Lanon.0d252a227dcf2249288cd9db6e2d5b21.12:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/0607116/crates/bevy_ecs/src/query/state.rs"
-	.size	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.12, 97
-
-	.type	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.13,@object
-	.section	.data.rel.ro..Lanon.0d252a227dcf2249288cd9db6e2d5b21.13,"aw",@progbits
-	.p2align	3, 0x0
-.Lanon.0d252a227dcf2249288cd9db6e2d5b21.13:
-	.quad	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.12
-	.asciz	"a\000\000\000\000\000\000\000\344\000\000\000\t\000\000"
-	.size	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.13, 24
-
-	.type	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.14,@object
-	.section	.data.rel.ro..Lanon.0d252a227dcf2249288cd9db6e2d5b21.14,"aw",@progbits
-	.p2align	3, 0x0
-.Lanon.0d252a227dcf2249288cd9db6e2d5b21.14:
-	.quad	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.12
-	.asciz	"a\000\000\000\000\000\000\000\330\000\000\000!\000\000"
-	.size	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.14, 24
+	.asciz	"a\000\000\000\000\000\000\000\321\000\000\000\016\000\000"
+	.size	.Lanon.0d252a227dcf2249288cd9db6e2d5b21.10, 24
 
 	.hidden	DW.ref.rust_eh_personality
 	.weak	DW.ref.rust_eh_personality
diff --git a/results/query_state_get.s b/results/query_state_get.s
index 6dc03d2..e132d3d 100644
--- a/results/query_state_get.s
+++ b/results/query_state_get.s
@@ -1,19 +1,5 @@
 	.text
-	.file	"query_state_get.740f791e4e88027e-cgu.0"
-	.section	".text.<&T as core::fmt::Display>::fmt","ax",@progbits
-	.p2align	4, 0x90
-	.type	<&T as core::fmt::Display>::fmt,@function
-<&T as core::fmt::Display>::fmt:
-	.cfi_startproc
-	movq	%rsi, %rdx
-	movq	(%rdi), %rax
-	movq	8(%rdi), %rsi
-	movq	%rax, %rdi
-	jmpq	*<str as core::fmt::Display>::fmt@GOTPCREL(%rip)
-.Lfunc_end0:
-	.size	<&T as core::fmt::Display>::fmt, .Lfunc_end0-<&T as core::fmt::Display>::fmt
-	.cfi_endproc
-
+	.file	"query_state_get.202507d028312342-cgu.0"
 	.section	".text.core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>","ax",@progbits
 	.p2align	4, 0x90
 	.type	core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>,@function
@@ -37,53 +23,53 @@ core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::compo
 	movq	%rdi, %rbx
 	movq	32(%rdi), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_2
+	je	.LBB0_2
 	movq	24(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB1_2:
+.LBB0_2:
 	movq	64(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_4
+	je	.LBB0_4
 	movq	56(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB1_4:
+.LBB0_4:
 	movq	(%rbx), %r14
 	movq	16(%rbx), %r15
 	testq	%r15, %r15
-	je	.LBB1_11
+	je	.LBB0_11
 	leaq	40(%r14), %r12
 	movq	__rust_dealloc@GOTPCREL(%rip), %r13
-	jmp	.LBB1_6
+	jmp	.LBB0_6
 	.p2align	4, 0x90
-.LBB1_10:
+.LBB0_10:
 	addq	$64, %r12
 	decq	%r15
-	je	.LBB1_11
-.LBB1_6:
+	je	.LBB0_11
+.LBB0_6:
 	movq	-32(%r12), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_8
+	je	.LBB0_8
 	movq	-40(%r12), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*%r13
-.LBB1_8:
+.LBB0_8:
 	movq	(%r12), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_10
+	je	.LBB0_10
 	movq	-8(%r12), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*%r13
-	jmp	.LBB1_10
-.LBB1_11:
+	jmp	.LBB0_10
+.LBB0_11:
 	movq	8(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_12
+	je	.LBB0_12
 	shlq	$6, %rsi
 	movl	$8, %edx
 	movq	%r14, %rdi
@@ -98,7 +84,7 @@ core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::compo
 	popq	%r15
 	.cfi_def_cfa_offset 8
 	jmpq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB1_12:
+.LBB0_12:
 	.cfi_def_cfa_offset 48
 	popq	%rbx
 	.cfi_def_cfa_offset 40
@@ -111,8 +97,8 @@ core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::compo
 	popq	%r15
 	.cfi_def_cfa_offset 8
 	retq
-.Lfunc_end1:
-	.size	core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>, .Lfunc_end1-core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>
+.Lfunc_end0:
+	.size	core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>, .Lfunc_end0-core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>
 	.cfi_endproc
 
 	.section	".text.core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_get::A,&query_state_get::B)>>","ax",@progbits
@@ -134,51 +120,51 @@ core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_ge
 	movq	%rdi, %rbx
 	movq	24(%rdi), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_2
+	je	.LBB1_2
 	movq	16(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_2:
+.LBB1_2:
 	movq	56(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_4
+	je	.LBB1_4
 	movq	48(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_4:
+.LBB1_4:
 	movq	88(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_6
+	je	.LBB1_6
 	movq	80(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_6:
+.LBB1_6:
 	movq	120(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_8
+	je	.LBB1_8
 	movq	112(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_8:
+.LBB1_8:
 	leaq	152(%rbx), %rdi
 .Ltmp0:
 	callq	core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>
 .Ltmp1:
 	movq	256(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_11
+	je	.LBB1_11
 	movq	248(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_11:
+.LBB1_11:
 	movq	280(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_16
+	je	.LBB1_16
 	movq	272(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
@@ -189,7 +175,7 @@ core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_ge
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	jmpq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_16:
+.LBB1_16:
 	.cfi_def_cfa_offset 32
 	addq	$8, %rsp
 	.cfi_def_cfa_offset 24
@@ -198,7 +184,7 @@ core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_ge
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB2_13:
+.LBB1_13:
 	.cfi_def_cfa_offset 32
 .Ltmp2:
 	movq	%rax, %r14
@@ -215,16 +201,16 @@ core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_ge
 	movq	%r14, %rdi
 	callq	_Unwind_Resume@PLT
 	ud2
-.LBB2_17:
+.LBB1_17:
 .Ltmp7:
 	callq	*core::panicking::panic_cannot_unwind@GOTPCREL(%rip)
 	ud2
-.Lfunc_end2:
-	.size	core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_get::A,&query_state_get::B)>>, .Lfunc_end2-core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_get::A,&query_state_get::B)>>
+.Lfunc_end1:
+	.size	core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_get::A,&query_state_get::B)>>, .Lfunc_end1-core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_get::A,&query_state_get::B)>>
 	.cfi_endproc
 	.section	".gcc_except_table.core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_get::A,&query_state_get::B)>>","a",@progbits
 	.p2align	2, 0x0
-GCC_except_table2:
+GCC_except_table1:
 .Lexception0:
 	.byte	255
 	.byte	155
@@ -242,7 +228,7 @@ GCC_except_table2:
 	.uleb128 .Ltmp7-.Lfunc_begin0
 	.byte	1
 	.uleb128 .Ltmp6-.Lfunc_begin0
-	.uleb128 .Lfunc_end2-.Ltmp6
+	.uleb128 .Lfunc_end1-.Ltmp6
 	.byte	0
 	.byte	0
 .Lcst_end0:
@@ -259,14 +245,14 @@ GCC_except_table2:
 core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>:
 	.cfi_startproc
 	testq	%rsi, %rsi
-	je	.LBB3_1
+	je	.LBB2_1
 	shlq	$2, %rsi
 	movl	$4, %edx
 	jmpq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB3_1:
+.LBB2_1:
 	retq
-.Lfunc_end3:
-	.size	core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>, .Lfunc_end3-core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>
+.Lfunc_end2:
+	.size	core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>, .Lfunc_end2-core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>
 	.cfi_endproc
 
 	.section	".text.core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>","ax",@progbits
@@ -275,14 +261,14 @@ core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>:
 core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>:
 	.cfi_startproc
 	testq	%rsi, %rsi
-	je	.LBB4_1
+	je	.LBB3_1
 	shlq	$2, %rsi
 	movl	$4, %edx
 	jmpq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB4_1:
+.LBB3_1:
 	retq
-.Lfunc_end4:
-	.size	core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>, .Lfunc_end4-core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>
+.Lfunc_end3:
+	.size	core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>, .Lfunc_end3-core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>
 	.cfi_endproc
 
 	.section	.text.alloc::raw_vec::finish_grow,"ax",@progbits
@@ -302,41 +288,41 @@ alloc::raw_vec::finish_grow:
 	movq	%rdx, %rbx
 	movq	%rdi, %r14
 	testq	%rsi, %rsi
-	je	.LBB5_6
+	je	.LBB4_6
 	movq	%rsi, %r15
 	cmpq	$0, 8(%rcx)
-	je	.LBB5_7
+	je	.LBB4_7
 	movq	16(%rcx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB5_7
+	je	.LBB4_7
 	movq	(%rcx), %rdi
 	movq	%r15, %rdx
 	movq	%rbx, %rcx
 	callq	*__rust_realloc@GOTPCREL(%rip)
 	testq	%rax, %rax
-	jne	.LBB5_11
-.LBB5_4:
+	jne	.LBB4_11
+.LBB4_4:
 	movq	%r15, 8(%r14)
-	jmp	.LBB5_5
-.LBB5_7:
+	jmp	.LBB4_5
+.LBB4_7:
 	testq	%rbx, %rbx
-	je	.LBB5_8
+	je	.LBB4_8
 	movq	__rust_no_alloc_shim_is_unstable@GOTPCREL(%rip), %rax
 	movzbl	(%rax), %eax
 	movq	%rbx, %rdi
 	movq	%r15, %rsi
 	callq	*__rust_alloc@GOTPCREL(%rip)
 	testq	%rax, %rax
-	je	.LBB5_4
-.LBB5_11:
+	je	.LBB4_4
+.LBB4_11:
 	movq	%rax, 8(%r14)
 	xorl	%eax, %eax
-	jmp	.LBB5_12
-.LBB5_6:
+	jmp	.LBB4_12
+.LBB4_6:
 	movq	$0, 8(%r14)
-.LBB5_5:
+.LBB4_5:
 	movl	$1, %eax
-.LBB5_12:
+.LBB4_12:
 	movq	%rbx, 16(%r14)
 	movq	%rax, (%r14)
 	popq	%rbx
@@ -346,14 +332,14 @@ alloc::raw_vec::finish_grow:
 	popq	%r15
 	.cfi_def_cfa_offset 8
 	retq
-.LBB5_8:
+.LBB4_8:
 	.cfi_def_cfa_offset 32
 	movq	%r15, %rax
 	testq	%rax, %rax
-	jne	.LBB5_11
-	jmp	.LBB5_4
-.Lfunc_end5:
-	.size	alloc::raw_vec::finish_grow, .Lfunc_end5-alloc::raw_vec::finish_grow
+	jne	.LBB4_11
+	jmp	.LBB4_4
+.Lfunc_end4:
+	.size	alloc::raw_vec::finish_grow, .Lfunc_end4-alloc::raw_vec::finish_grow
 	.cfi_endproc
 
 	.section	".text.alloc::raw_vec::RawVec<T,A>::reserve_for_push","ax",@progbits
@@ -370,7 +356,7 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	.cfi_offset %rbx, -24
 	.cfi_offset %r14, -16
 	incq	%rsi
-	je	.LBB6_10
+	je	.LBB5_10
 	movq	%rdi, %rbx
 	movq	8(%rdi), %rax
 	leaq	(%rax,%rax), %rcx
@@ -386,25 +372,25 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	leaq	(,%r14,4), %rdx
 	shlq	$2, %rsi
 	testq	%rax, %rax
-	je	.LBB6_3
+	je	.LBB5_3
 	movq	(%rbx), %rcx
 	shlq	$2, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$4, 16(%rsp)
 	movq	%rax, 24(%rsp)
-	jmp	.LBB6_4
-.LBB6_3:
+	jmp	.LBB5_4
+.LBB5_3:
 	movq	$0, 16(%rsp)
-.LBB6_4:
+.LBB5_4:
 	leaq	32(%rsp), %rdi
 	leaq	8(%rsp), %rcx
 	callq	alloc::raw_vec::finish_grow
 	cmpq	$0, 32(%rsp)
 	movq	40(%rsp), %rdi
-	je	.LBB6_5
+	je	.LBB5_5
 	movabsq	$-9223372036854775807, %rax
 	cmpq	%rax, %rdi
-	jne	.LBB6_8
+	jne	.LBB5_8
 	addq	$56, %rsp
 	.cfi_def_cfa_offset 24
 	popq	%rbx
@@ -412,7 +398,7 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB6_5:
+.LBB5_5:
 	.cfi_def_cfa_offset 80
 	movq	%rdi, (%rbx)
 	movq	%r14, 8(%rbx)
@@ -423,19 +409,19 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB6_8:
+.LBB5_8:
 	.cfi_def_cfa_offset 80
 	testq	%rdi, %rdi
-	jne	.LBB6_9
-.LBB6_10:
+	jne	.LBB5_9
+.LBB5_10:
 	callq	*alloc::raw_vec::capacity_overflow@GOTPCREL(%rip)
 	ud2
-.LBB6_9:
+.LBB5_9:
 	movq	48(%rsp), %rsi
 	callq	*alloc::alloc::handle_alloc_error@GOTPCREL(%rip)
 	ud2
-.Lfunc_end6:
-	.size	alloc::raw_vec::RawVec<T,A>::reserve_for_push, .Lfunc_end6-alloc::raw_vec::RawVec<T,A>::reserve_for_push
+.Lfunc_end5:
+	.size	alloc::raw_vec::RawVec<T,A>::reserve_for_push, .Lfunc_end5-alloc::raw_vec::RawVec<T,A>::reserve_for_push
 	.cfi_endproc
 
 	.section	".text.alloc::raw_vec::RawVec<T,A>::reserve_for_push","ax",@progbits
@@ -452,7 +438,7 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	.cfi_offset %rbx, -24
 	.cfi_offset %r14, -16
 	incq	%rsi
-	je	.LBB7_10
+	je	.LBB6_10
 	movq	%rdi, %rbx
 	movq	8(%rdi), %rax
 	leaq	(%rax,%rax), %rcx
@@ -468,25 +454,25 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	leaq	(,%r14,4), %rdx
 	shlq	$2, %rsi
 	testq	%rax, %rax
-	je	.LBB7_3
+	je	.LBB6_3
 	movq	(%rbx), %rcx
 	shlq	$2, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$4, 16(%rsp)
 	movq	%rax, 24(%rsp)
-	jmp	.LBB7_4
-.LBB7_3:
+	jmp	.LBB6_4
+.LBB6_3:
 	movq	$0, 16(%rsp)
-.LBB7_4:
+.LBB6_4:
 	leaq	32(%rsp), %rdi
 	leaq	8(%rsp), %rcx
 	callq	alloc::raw_vec::finish_grow
 	cmpq	$0, 32(%rsp)
 	movq	40(%rsp), %rdi
-	je	.LBB7_5
+	je	.LBB6_5
 	movabsq	$-9223372036854775807, %rax
 	cmpq	%rax, %rdi
-	jne	.LBB7_8
+	jne	.LBB6_8
 	addq	$56, %rsp
 	.cfi_def_cfa_offset 24
 	popq	%rbx
@@ -494,7 +480,7 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB7_5:
+.LBB6_5:
 	.cfi_def_cfa_offset 80
 	movq	%rdi, (%rbx)
 	movq	%r14, 8(%rbx)
@@ -505,19 +491,19 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB7_8:
+.LBB6_8:
 	.cfi_def_cfa_offset 80
 	testq	%rdi, %rdi
-	jne	.LBB7_9
-.LBB7_10:
+	jne	.LBB6_9
+.LBB6_10:
 	callq	*alloc::raw_vec::capacity_overflow@GOTPCREL(%rip)
 	ud2
-.LBB7_9:
+.LBB6_9:
 	movq	48(%rsp), %rsi
 	callq	*alloc::alloc::handle_alloc_error@GOTPCREL(%rip)
 	ud2
-.Lfunc_end7:
-	.size	alloc::raw_vec::RawVec<T,A>::reserve_for_push, .Lfunc_end7-alloc::raw_vec::RawVec<T,A>::reserve_for_push
+.Lfunc_end6:
+	.size	alloc::raw_vec::RawVec<T,A>::reserve_for_push, .Lfunc_end6-alloc::raw_vec::RawVec<T,A>::reserve_for_push
 	.cfi_endproc
 
 	.section	.text.query_get,"ax",@progbits
@@ -551,82 +537,83 @@ query_get:
 	.cfi_offset %rbp, -16
 	movl	%edx, 92(%rsp)
 	movq	%rsi, 208(%rsp)
-	movq	(%rdi), %rax
-	cmpq	752(%rcx), %rax
-	movq	%rdi, (%rsp)
-	jne	.LBB8_1
 	movq	%rdi, %rbp
-	movq	%rcx, 160(%rsp)
+	movq	752(%rcx), %rsi
+	movq	(%rdi), %rdi
+	cmpq	%rsi, %rdi
+	jne	.LBB7_5
+	movq	%rcx, 112(%rsp)
 	movq	168(%rcx), %rsi
-	movq	8(%rdi), %r15
-	movq	%rsi, 8(%rdi)
+	movq	8(%rbp), %r15
+	movq	%rsi, 8(%rbp)
 	cmpq	%rsi, %r15
-	jae	.LBB8_48
+	jae	.LBB7_47
 	leaq	80(%rbp), %rax
 	movq	%rax, 72(%rsp)
 	leaq	104(%rbp), %rax
 	movq	%rax, 64(%rsp)
 	leaq	112(%rbp), %rax
-	movq	%rax, 184(%rsp)
+	movq	%rax, 136(%rsp)
 	leaq	136(%rbp), %rax
-	movq	%rax, 168(%rsp)
+	movq	%rax, 120(%rsp)
 	leaq	312(%rbp), %rax
 	movq	%rax, 232(%rsp)
 	leaq	48(%rbp), %rax
 	movq	%rax, 224(%rsp)
 	leaq	72(%rbp), %rax
-	movq	%rax, 152(%rsp)
+	movq	%rax, 104(%rsp)
 	leaq	272(%rbp), %rax
 	movq	%rax, 200(%rsp)
 	leaq	16(%rbp), %rax
 	movq	%rax, 216(%rsp)
 	leaq	40(%rbp), %rax
-	movq	%rax, 144(%rsp)
+	movq	%rax, 96(%rsp)
 	leaq	248(%rbp), %rax
 	movq	%rax, 192(%rsp)
-	movq	160(%rsp), %rax
+	movq	112(%rsp), %rax
 	movq	152(%rax), %rax
-	movq	%rax, 8(%rsp)
-	movq	%rsi, 176(%rsp)
-	jmp	.LBB8_6
-.LBB8_45:
-	movq	(%rsp), %rbp
+	movq	%rax, 24(%rsp)
+	movq	%rbp, 16(%rsp)
+	movq	%rsi, 128(%rsp)
+	jmp	.LBB7_3
+.LBB7_44:
+	movq	16(%rsp), %rbp
 	movq	264(%rbp), %rsi
-.LBB8_46:
+.LBB7_45:
 	movq	248(%rbp), %rax
 	movl	%r14d, (%rax,%rsi,4)
 	incq	%rsi
 	movq	%rsi, 264(%rbp)
-	movq	176(%rsp), %rsi
+	movq	128(%rsp), %rsi
 	.p2align	4, 0x90
-.LBB8_47:
+.LBB7_46:
 	incq	%r15
 	cmpq	%r15, %rsi
-	je	.LBB8_48
-.LBB8_6:
+	je	.LBB7_47
+.LBB7_3:
 	movl	%r15d, %edi
 	cmpq	%rsi, %rdi
-	jae	.LBB8_7
+	jae	.LBB7_4
 	imulq	$152, %rdi, %rdi
 	movq	296(%rbp), %rax
-	movq	8(%rsp), %rcx
+	movq	24(%rsp), %rcx
 	movq	136(%rcx,%rdi), %rcx
 	cmpq	%rax, %rcx
-	jbe	.LBB8_47
-	movq	8(%rsp), %rdx
+	jbe	.LBB7_46
+	movq	24(%rsp), %rdx
 	movq	128(%rdx,%rdi), %r12
 	testq	%r12, %r12
-	je	.LBB8_47
+	je	.LBB7_46
 	shlq	$4, %rax
 	cmpq	$0, (%r12,%rax)
-	je	.LBB8_47
+	je	.LBB7_46
 	movq	304(%rbp), %r13
 	cmpq	%r13, %rcx
-	jbe	.LBB8_47
+	jbe	.LBB7_46
 	shlq	$4, %r13
 	cmpq	$0, (%r12,%r13)
-	je	.LBB8_47
-	movq	8(%rsp), %rcx
+	je	.LBB7_46
+	movq	24(%rsp), %rcx
 	movq	%rdi, 80(%rsp)
 	movq	96(%rcx,%rdi), %rcx
 	movq	8(%r12,%rax), %rax
@@ -634,15 +621,15 @@ query_get:
 	movq	%rcx, 240(%rsp)
 	movq	(%rcx,%rax), %rbp
 	leaq	1(%rbp), %rbx
-.Ltmp10:
+.Ltmp12:
 	movq	72(%rsp), %rdi
 	movq	%rbx, %rsi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp11:
-	movq	%rbp, 48(%rsp)
+.Ltmp13:
+	movq	%rbp, 8(%rsp)
 	movq	64(%rsp), %rax
 	cmpq	%rbp, (%rax)
-	jbe	.LBB8_15
+	jbe	.LBB7_14
 	movq	%rbx, %rsi
 	movq	%rbp, %r14
 	shrq	$5, %r14
@@ -652,34 +639,34 @@ query_get:
 	movq	72(%rsp), %rax
 	movq	(%rax), %rax
 	orl	%ebx, (%rax,%r14,4)
-.Ltmp12:
-	movq	184(%rsp), %rdi
+.Ltmp14:
+	movq	136(%rsp), %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp13:
-	movq	%rbp, 48(%rsp)
-	movq	168(%rsp), %rax
+.Ltmp15:
+	movq	%rbp, 8(%rsp)
+	movq	120(%rsp), %rax
 	cmpq	%rbp, (%rax)
-	jbe	.LBB8_20
-	movq	184(%rsp), %rax
+	jbe	.LBB7_19
+	movq	136(%rsp), %rax
 	movq	(%rax), %rax
 	orl	%ebx, (%rax,%r14,4)
 	leaq	(%r12,%r13), %rax
 	cmpq	$0, (%rax)
 	movq	72(%rsp), %rdx
-	je	.LBB8_25
+	je	.LBB7_24
 	movq	8(%r12,%r13), %rax
 	shlq	$4, %rax
 	movq	240(%rsp), %rcx
 	movq	(%rcx,%rax), %r14
 	leaq	1(%r14), %rsi
-.Ltmp14:
+.Ltmp16:
 	movq	%rdx, %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp15:
-	movq	%r14, 48(%rsp)
+.Ltmp17:
+	movq	%r14, 8(%rsp)
 	movq	64(%rsp), %rax
 	cmpq	%r14, (%rax)
-	jbe	.LBB8_15
+	jbe	.LBB7_14
 	movl	$1, %eax
 	movl	%r14d, %ecx
 	shll	%cl, %eax
@@ -687,123 +674,123 @@ query_get:
 	movq	(%rdx), %rcx
 	shrq	$5, %r14
 	orl	%eax, (%rcx,%r14,4)
-.LBB8_25:
-.Ltmp16:
-	movq	8(%rsp), %rax
+.LBB7_24:
+.Ltmp18:
+	movq	24(%rsp), %rax
 	movq	80(%rsp), %rcx
 	leaq	(%rax,%rcx), %rsi
 	movq	232(%rsp), %rdi
 	callq	*<() as bevy_ecs::query::fetch::WorldQuery>::update_archetype_component_access@GOTPCREL(%rip)
-.Ltmp17:
-	movq	8(%rsp), %rax
+.Ltmp19:
+	movq	24(%rsp), %rax
 	movq	80(%rsp), %rcx
 	movl	144(%rax,%rcx), %r14d
 	movq	%r14, %r12
 	shrq	$5, %r12
-	movq	(%rsp), %rbp
+	movq	16(%rsp), %rbp
 	cmpq	64(%rbp), %r12
-	jae	.LBB8_35
+	jae	.LBB7_34
 	movq	48(%rbp), %rax
 	testq	%rax, %rax
-	je	.LBB8_35
+	je	.LBB7_34
 	movl	(%rax,%r12,4), %eax
 	btl	%r14d, %eax
-	jb	.LBB8_29
-.LBB8_35:
+	jb	.LBB7_28
+.LBB7_34:
 	leaq	1(%r14), %rsi
-.Ltmp18:
+.Ltmp20:
 	movq	224(%rsp), %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp19:
-	movq	%r14, 48(%rsp)
-	movq	152(%rsp), %rax
+.Ltmp21:
+	movq	%r14, 8(%rsp)
+	movq	104(%rsp), %rax
 	cmpq	%r14, (%rax)
-	jbe	.LBB8_37
+	jbe	.LBB7_36
 	movl	$1, %eax
 	movl	%r14d, %ecx
 	shll	%cl, %eax
-	movq	(%rsp), %rbp
+	movq	16(%rsp), %rbp
 	movq	48(%rbp), %rcx
 	orl	%eax, (%rcx,%r12,4)
 	movq	288(%rbp), %rsi
 	cmpq	280(%rbp), %rsi
-	jne	.LBB8_42
-.Ltmp20:
+	jne	.LBB7_41
+.Ltmp22:
 	movq	200(%rsp), %rdi
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
-.Ltmp21:
-	movq	(%rsp), %rbp
+.Ltmp23:
+	movq	16(%rsp), %rbp
 	movq	288(%rbp), %rsi
-.LBB8_42:
+.LBB7_41:
 	movq	272(%rbp), %rax
 	movl	%r14d, (%rax,%rsi,4)
 	incq	%rsi
 	movq	%rsi, 288(%rbp)
 	movq	80(%rsp), %rcx
-.LBB8_29:
-	movq	8(%rsp), %rax
+.LBB7_28:
+	movq	24(%rsp), %rax
 	movl	148(%rax,%rcx), %r14d
 	movq	%r14, %rbx
 	shrq	$5, %rbx
 	cmpq	32(%rbp), %rbx
-	movq	176(%rsp), %rsi
-	jae	.LBB8_32
+	movq	128(%rsp), %rsi
+	jae	.LBB7_31
 	movq	16(%rbp), %rax
 	testq	%rax, %rax
-	je	.LBB8_32
+	je	.LBB7_31
 	movl	(%rax,%rbx,4), %eax
 	btl	%r14d, %eax
-	jb	.LBB8_47
-.LBB8_32:
+	jb	.LBB7_46
+.LBB7_31:
 	leaq	1(%r14), %rsi
-.Ltmp22:
+.Ltmp24:
 	movq	216(%rsp), %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp23:
-	movq	%r14, 48(%rsp)
-	movq	144(%rsp), %rax
+.Ltmp25:
+	movq	%r14, 8(%rsp)
+	movq	96(%rsp), %rax
 	cmpq	%r14, (%rax)
-	jbe	.LBB8_34
+	jbe	.LBB7_33
 	movl	$1, %eax
 	movl	%r14d, %ecx
 	shll	%cl, %eax
-	movq	(%rsp), %rbp
+	movq	16(%rsp), %rbp
 	movq	16(%rbp), %rcx
 	orl	%eax, (%rcx,%rbx,4)
 	movq	264(%rbp), %rsi
 	cmpq	256(%rbp), %rsi
-	jne	.LBB8_46
-.Ltmp27:
+	jne	.LBB7_45
+.Ltmp29:
 	movq	192(%rsp), %rdi
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
-.Ltmp28:
-	jmp	.LBB8_45
-.LBB8_48:
-	movq	160(%rsp), %rbx
+.Ltmp30:
+	jmp	.LBB7_44
+.LBB7_47:
+	movq	112(%rsp), %rbx
 	movl	760(%rbx), %eax
 	movl	764(%rbx), %ecx
 	movl	92(%rsp), %edx
 	cmpq	%rdx, 16(%rbx)
 	movq	208(%rsp), %r11
-	jbe	.LBB8_59
+	jbe	.LBB7_58
 	movq	(%rbx), %rsi
 	leaq	(%rdx,%rdx,4), %rdi
 	cmpl	%r11d, (%rsi,%rdi,4)
-	jne	.LBB8_59
+	jne	.LBB7_58
 	movl	4(%rsi,%rdi,4), %r8d
 	movl	$4294967295, %r9d
 	cmpq	%r9, %r8
-	je	.LBB8_59
+	je	.LBB7_58
 	movq	%r8, %r9
 	shrq	$5, %r9
 	cmpq	64(%rbp), %r9
-	jae	.LBB8_60
+	jae	.LBB7_59
 	movq	48(%rbp), %r10
 	testq	%r10, %r10
-	je	.LBB8_60
+	je	.LBB7_59
 	movl	(%r10,%r9,4), %r9d
 	btl	%r8d, %r9d
-	jae	.LBB8_60
+	jae	.LBB7_59
 	leaq	(%rsi,%rdi,4), %rdx
 	addq	$4, %rdx
 	movl	8(%rdx), %edi
@@ -834,20 +821,20 @@ query_get:
 	movq	72(%r9,%r10), %rdx
 	addq	%rsi, %rdx
 	addq	16(%r9,%r8), %rsi
-	jmp	.LBB8_62
-.LBB8_59:
+	jmp	.LBB7_61
+.LBB7_58:
 	shlq	$32, %r11
 	orq	$1, %r11
-.LBB8_61:
+.LBB7_60:
 	xorl	%edi, %edi
-.LBB8_62:
-	movq	%rdi, 96(%rsp)
-	movq	%r11, 104(%rsp)
-	movq	%rdx, 112(%rsp)
-	movl	%ecx, 120(%rsp)
-	movl	%eax, 124(%rsp)
-	movq	%rsi, 128(%rsp)
-	leaq	96(%rsp), %rax
+.LBB7_61:
+	movq	%rdi, 144(%rsp)
+	movq	%r11, 152(%rsp)
+	movq	%rdx, 160(%rsp)
+	movl	%ecx, 168(%rsp)
+	movl	%eax, 172(%rsp)
+	movq	%rsi, 176(%rsp)
+	leaq	144(%rsp), %rax
 	#APP
 	#NO_APP
 	movq	%rbp, %rdi
@@ -867,110 +854,100 @@ query_get:
 	popq	%rbp
 	.cfi_def_cfa_offset 8
 	retq
-.LBB8_60:
+.LBB7_59:
 	.cfi_def_cfa_offset 304
 	shlq	$32, %r11
-	jmp	.LBB8_61
-.LBB8_7:
-.Ltmp8:
-	leaq	.Lanon.161d7961c923b4e842c0f6e55225f2ee.14(%rip), %rdx
+	jmp	.LBB7_60
+.LBB7_4:
+.Ltmp10:
+	leaq	.Lanon.161d7961c923b4e842c0f6e55225f2ee.9(%rip), %rdx
 	callq	*core::panicking::panic_bounds_check@GOTPCREL(%rip)
-.Ltmp9:
-	jmp	.LBB8_3
-.LBB8_15:
-	leaq	48(%rsp), %rax
-	movq	%rax, 16(%rsp)
+.Ltmp11:
+	jmp	.LBB7_6
+.LBB7_14:
+	leaq	8(%rsp), %rax
+	movq	%rax, 32(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
-	movq	%rax, 24(%rsp)
+	movq	%rax, 40(%rsp)
 	movq	64(%rsp), %rcx
-	jmp	.LBB8_16
-.LBB8_20:
-	leaq	48(%rsp), %rax
-	movq	%rax, 16(%rsp)
+	jmp	.LBB7_15
+.LBB7_19:
+	leaq	8(%rsp), %rax
+	movq	%rax, 32(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
-	movq	%rax, 24(%rsp)
-	movq	168(%rsp), %rcx
-.LBB8_16:
-	movq	%rcx, 32(%rsp)
 	movq	%rax, 40(%rsp)
+	movq	120(%rsp), %rcx
+.LBB7_15:
+	movq	%rcx, 48(%rsp)
+	movq	%rax, 56(%rsp)
 	leaq	.Lanon.161d7961c923b4e842c0f6e55225f2ee.6(%rip), %rax
-	movq	%rax, 96(%rsp)
+	movq	%rax, 144(%rsp)
 	leaq	.Lanon.161d7961c923b4e842c0f6e55225f2ee.7(%rip), %rsi
-	jmp	.LBB8_17
-.LBB8_37:
-	leaq	48(%rsp), %rax
-	movq	%rax, 16(%rsp)
+	jmp	.LBB7_16
+.LBB7_36:
+	leaq	8(%rsp), %rax
+	movq	%rax, 32(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
-	movq	%rax, 24(%rsp)
-	movq	152(%rsp), %rcx
-	jmp	.LBB8_38
-.LBB8_34:
-	leaq	48(%rsp), %rax
-	movq	%rax, 16(%rsp)
+	movq	%rax, 40(%rsp)
+	movq	104(%rsp), %rcx
+	jmp	.LBB7_37
+.LBB7_33:
+	leaq	8(%rsp), %rax
+	movq	%rax, 32(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
-	movq	%rax, 24(%rsp)
-	movq	144(%rsp), %rcx
-.LBB8_38:
-	movq	%rcx, 32(%rsp)
 	movq	%rax, 40(%rsp)
+	movq	96(%rsp), %rcx
+.LBB7_37:
+	movq	%rcx, 48(%rsp)
+	movq	%rax, 56(%rsp)
 	leaq	.Lanon.161d7961c923b4e842c0f6e55225f2ee.2(%rip), %rax
-	movq	%rax, 96(%rsp)
+	movq	%rax, 144(%rsp)
 	leaq	.Lanon.161d7961c923b4e842c0f6e55225f2ee.4(%rip), %rsi
-.LBB8_17:
-	movl	$2, %eax
-	leaq	16(%rsp), %rcx
-.LBB8_2:
-	leaq	96(%rsp), %rdi
+.LBB7_16:
+	leaq	32(%rsp), %rax
+	leaq	144(%rsp), %rdi
 	movq	$2, 8(%rdi)
 	movq	$0, 32(%rdi)
-	movq	%rcx, 16(%rdi)
-	movq	%rax, 24(%rdi)
-.Ltmp24:
-	movq	(%rsp), %rbp
+	movq	%rax, 16(%rdi)
+	movq	$2, 24(%rdi)
+.Ltmp26:
+	movq	16(%rsp), %rbp
 	callq	*core::panicking::panic_fmt@GOTPCREL(%rip)
-.Ltmp25:
-.LBB8_3:
+.Ltmp27:
+	jmp	.LBB7_6
+.LBB7_5:
+.Ltmp8:
+	leaq	.Lanon.161d7961c923b4e842c0f6e55225f2ee.10(%rip), %rdx
+	callq	*bevy_ecs::query::state::QueryState<Q,F>::validate_world::panic_mismatched@GOTPCREL(%rip)
+.Ltmp9:
+.LBB7_6:
 	ud2
-.LBB8_1:
-	leaq	.Lanon.161d7961c923b4e842c0f6e55225f2ee.11(%rip), %rax
-	movq	%rax, 16(%rsp)
-	movq	$82, 24(%rsp)
-	leaq	16(%rsp), %rax
-	movq	%rax, 48(%rsp)
-	leaq	<&T as core::fmt::Display>::fmt(%rip), %rax
-	movq	%rax, 56(%rsp)
-	leaq	.Lanon.161d7961c923b4e842c0f6e55225f2ee.10(%rip), %rax
-	movq	%rax, 96(%rsp)
-	leaq	.Lanon.161d7961c923b4e842c0f6e55225f2ee.13(%rip), %rsi
-	movl	$1, %eax
-	leaq	48(%rsp), %rcx
-	jmp	.LBB8_2
-.LBB8_55:
-.Ltmp29:
+.LBB7_54:
+.Ltmp31:
 	movq	%rax, %r14
-	movq	(%rsp), %rbp
-	jmp	.LBB8_57
-.LBB8_56:
-.Ltmp26:
+	movq	16(%rsp), %rbp
+	jmp	.LBB7_56
+.LBB7_55:
+.Ltmp28:
 	movq	%rax, %r14
-.LBB8_57:
-.Ltmp30:
+.LBB7_56:
+.Ltmp32:
 	movq	%rbp, %rdi
 	callq	core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_get::A,&query_state_get::B)>>
-.Ltmp31:
+.Ltmp33:
 	movq	%r14, %rdi
 	callq	_Unwind_Resume@PLT
 	ud2
-.LBB8_63:
-.Ltmp32:
+.LBB7_62:
+.Ltmp34:
 	callq	*core::panicking::panic_cannot_unwind@GOTPCREL(%rip)
 	ud2
-.Lfunc_end8:
-	.size	query_get, .Lfunc_end8-query_get
+.Lfunc_end7:
+	.size	query_get, .Lfunc_end7-query_get
 	.cfi_endproc
 	.section	.gcc_except_table.query_get,"a",@progbits
 	.p2align	2, 0x0
-GCC_except_table8:
+GCC_except_table7:
 .Lexception1:
 	.byte	255
 	.byte	155
@@ -979,24 +956,24 @@ GCC_except_table8:
 	.byte	1
 	.uleb128 .Lcst_end1-.Lcst_begin1
 .Lcst_begin1:
-	.uleb128 .Ltmp10-.Lfunc_begin1
-	.uleb128 .Ltmp28-.Ltmp10
-	.uleb128 .Ltmp29-.Lfunc_begin1
+	.uleb128 .Ltmp12-.Lfunc_begin1
+	.uleb128 .Ltmp30-.Ltmp12
+	.uleb128 .Ltmp31-.Lfunc_begin1
 	.byte	0
-	.uleb128 .Ltmp28-.Lfunc_begin1
-	.uleb128 .Ltmp8-.Ltmp28
+	.uleb128 .Ltmp30-.Lfunc_begin1
+	.uleb128 .Ltmp10-.Ltmp30
 	.byte	0
 	.byte	0
-	.uleb128 .Ltmp8-.Lfunc_begin1
-	.uleb128 .Ltmp25-.Ltmp8
-	.uleb128 .Ltmp26-.Lfunc_begin1
+	.uleb128 .Ltmp10-.Lfunc_begin1
+	.uleb128 .Ltmp9-.Ltmp10
+	.uleb128 .Ltmp28-.Lfunc_begin1
 	.byte	0
-	.uleb128 .Ltmp30-.Lfunc_begin1
-	.uleb128 .Ltmp31-.Ltmp30
 	.uleb128 .Ltmp32-.Lfunc_begin1
+	.uleb128 .Ltmp33-.Ltmp32
+	.uleb128 .Ltmp34-.Lfunc_begin1
 	.byte	1
-	.uleb128 .Ltmp31-.Lfunc_begin1
-	.uleb128 .Lfunc_end8-.Ltmp31
+	.uleb128 .Ltmp33-.Lfunc_begin1
+	.uleb128 .Lfunc_end7-.Ltmp33
 	.byte	0
 	.byte	0
 .Lcst_end1:
@@ -1070,52 +1047,24 @@ GCC_except_table8:
 	.type	.Lanon.161d7961c923b4e842c0f6e55225f2ee.8,@object
 	.section	.rodata..Lanon.161d7961c923b4e842c0f6e55225f2ee.8,"a",@progbits
 .Lanon.161d7961c923b4e842c0f6e55225f2ee.8:
-	.ascii	"Attempted to use "
-	.size	.Lanon.161d7961c923b4e842c0f6e55225f2ee.8, 17
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-41530a2346942c86/c9f9133/crates/bevy_ecs/src/query/state.rs"
+	.size	.Lanon.161d7961c923b4e842c0f6e55225f2ee.8, 97
 
 	.type	.Lanon.161d7961c923b4e842c0f6e55225f2ee.9,@object
-	.section	.rodata..Lanon.161d7961c923b4e842c0f6e55225f2ee.9,"a",@progbits
+	.section	.data.rel.ro..Lanon.161d7961c923b4e842c0f6e55225f2ee.9,"aw",@progbits
+	.p2align	3, 0x0
 .Lanon.161d7961c923b4e842c0f6e55225f2ee.9:
-	.ascii	" with a mismatched World. QueryStates can only be used with the World they were created from."
-	.size	.Lanon.161d7961c923b4e842c0f6e55225f2ee.9, 93
+	.quad	.Lanon.161d7961c923b4e842c0f6e55225f2ee.8
+	.asciz	"a\000\000\000\000\000\000\000\330\000\000\000!\000\000"
+	.size	.Lanon.161d7961c923b4e842c0f6e55225f2ee.9, 24
 
 	.type	.Lanon.161d7961c923b4e842c0f6e55225f2ee.10,@object
 	.section	.data.rel.ro..Lanon.161d7961c923b4e842c0f6e55225f2ee.10,"aw",@progbits
 	.p2align	3, 0x0
 .Lanon.161d7961c923b4e842c0f6e55225f2ee.10:
 	.quad	.Lanon.161d7961c923b4e842c0f6e55225f2ee.8
-	.asciz	"\021\000\000\000\000\000\000"
-	.quad	.Lanon.161d7961c923b4e842c0f6e55225f2ee.9
-	.asciz	"]\000\000\000\000\000\000"
-	.size	.Lanon.161d7961c923b4e842c0f6e55225f2ee.10, 32
-
-	.type	.Lanon.161d7961c923b4e842c0f6e55225f2ee.11,@object
-	.section	.rodata..Lanon.161d7961c923b4e842c0f6e55225f2ee.11,"a",@progbits
-.Lanon.161d7961c923b4e842c0f6e55225f2ee.11:
-	.ascii	"bevy_ecs::query::state::QueryState<(&mut query_state_get::A, &query_state_get::B)>"
-	.size	.Lanon.161d7961c923b4e842c0f6e55225f2ee.11, 82
-
-	.type	.Lanon.161d7961c923b4e842c0f6e55225f2ee.12,@object
-	.section	.rodata..Lanon.161d7961c923b4e842c0f6e55225f2ee.12,"a",@progbits
-.Lanon.161d7961c923b4e842c0f6e55225f2ee.12:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/0607116/crates/bevy_ecs/src/query/state.rs"
-	.size	.Lanon.161d7961c923b4e842c0f6e55225f2ee.12, 97
-
-	.type	.Lanon.161d7961c923b4e842c0f6e55225f2ee.13,@object
-	.section	.data.rel.ro..Lanon.161d7961c923b4e842c0f6e55225f2ee.13,"aw",@progbits
-	.p2align	3, 0x0
-.Lanon.161d7961c923b4e842c0f6e55225f2ee.13:
-	.quad	.Lanon.161d7961c923b4e842c0f6e55225f2ee.12
-	.asciz	"a\000\000\000\000\000\000\000\344\000\000\000\t\000\000"
-	.size	.Lanon.161d7961c923b4e842c0f6e55225f2ee.13, 24
-
-	.type	.Lanon.161d7961c923b4e842c0f6e55225f2ee.14,@object
-	.section	.data.rel.ro..Lanon.161d7961c923b4e842c0f6e55225f2ee.14,"aw",@progbits
-	.p2align	3, 0x0
-.Lanon.161d7961c923b4e842c0f6e55225f2ee.14:
-	.quad	.Lanon.161d7961c923b4e842c0f6e55225f2ee.12
-	.asciz	"a\000\000\000\000\000\000\000\330\000\000\000!\000\000"
-	.size	.Lanon.161d7961c923b4e842c0f6e55225f2ee.14, 24
+	.asciz	"a\000\000\000\000\000\000\000\321\000\000\000\016\000\000"
+	.size	.Lanon.161d7961c923b4e842c0f6e55225f2ee.10, 24
 
 	.hidden	DW.ref.rust_eh_personality
 	.weak	DW.ref.rust_eh_personality
diff --git a/results/query_state_get_sparse.s b/results/query_state_get_sparse.s
index c297305..71043ea 100644
--- a/results/query_state_get_sparse.s
+++ b/results/query_state_get_sparse.s
@@ -1,19 +1,5 @@
 	.text
-	.file	"query_state_get_sparse.309095e1cf5e2319-cgu.0"
-	.section	".text.<&T as core::fmt::Display>::fmt","ax",@progbits
-	.p2align	4, 0x90
-	.type	<&T as core::fmt::Display>::fmt,@function
-<&T as core::fmt::Display>::fmt:
-	.cfi_startproc
-	movq	%rsi, %rdx
-	movq	(%rdi), %rax
-	movq	8(%rdi), %rsi
-	movq	%rax, %rdi
-	jmpq	*<str as core::fmt::Display>::fmt@GOTPCREL(%rip)
-.Lfunc_end0:
-	.size	<&T as core::fmt::Display>::fmt, .Lfunc_end0-<&T as core::fmt::Display>::fmt
-	.cfi_endproc
-
+	.file	"query_state_get_sparse.4c9e9ad03a556b0c-cgu.0"
 	.section	".text.core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>","ax",@progbits
 	.p2align	4, 0x90
 	.type	core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>,@function
@@ -37,53 +23,53 @@ core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::compo
 	movq	%rdi, %rbx
 	movq	32(%rdi), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_2
+	je	.LBB0_2
 	movq	24(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB1_2:
+.LBB0_2:
 	movq	64(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_4
+	je	.LBB0_4
 	movq	56(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB1_4:
+.LBB0_4:
 	movq	(%rbx), %r14
 	movq	16(%rbx), %r15
 	testq	%r15, %r15
-	je	.LBB1_11
+	je	.LBB0_11
 	leaq	40(%r14), %r12
 	movq	__rust_dealloc@GOTPCREL(%rip), %r13
-	jmp	.LBB1_6
+	jmp	.LBB0_6
 	.p2align	4, 0x90
-.LBB1_10:
+.LBB0_10:
 	addq	$64, %r12
 	decq	%r15
-	je	.LBB1_11
-.LBB1_6:
+	je	.LBB0_11
+.LBB0_6:
 	movq	-32(%r12), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_8
+	je	.LBB0_8
 	movq	-40(%r12), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*%r13
-.LBB1_8:
+.LBB0_8:
 	movq	(%r12), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_10
+	je	.LBB0_10
 	movq	-8(%r12), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*%r13
-	jmp	.LBB1_10
-.LBB1_11:
+	jmp	.LBB0_10
+.LBB0_11:
 	movq	8(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_12
+	je	.LBB0_12
 	shlq	$6, %rsi
 	movl	$8, %edx
 	movq	%r14, %rdi
@@ -98,7 +84,7 @@ core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::compo
 	popq	%r15
 	.cfi_def_cfa_offset 8
 	jmpq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB1_12:
+.LBB0_12:
 	.cfi_def_cfa_offset 48
 	popq	%rbx
 	.cfi_def_cfa_offset 40
@@ -111,8 +97,8 @@ core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::compo
 	popq	%r15
 	.cfi_def_cfa_offset 8
 	retq
-.Lfunc_end1:
-	.size	core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>, .Lfunc_end1-core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>
+.Lfunc_end0:
+	.size	core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>, .Lfunc_end0-core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>
 	.cfi_endproc
 
 	.section	".text.core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_get_sparse::A,&query_state_get_sparse::B)>>","ax",@progbits
@@ -134,51 +120,51 @@ core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_ge
 	movq	%rdi, %rbx
 	movq	24(%rdi), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_2
+	je	.LBB1_2
 	movq	16(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_2:
+.LBB1_2:
 	movq	56(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_4
+	je	.LBB1_4
 	movq	48(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_4:
+.LBB1_4:
 	movq	88(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_6
+	je	.LBB1_6
 	movq	80(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_6:
+.LBB1_6:
 	movq	120(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_8
+	je	.LBB1_8
 	movq	112(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_8:
+.LBB1_8:
 	leaq	152(%rbx), %rdi
 .Ltmp0:
 	callq	core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>
 .Ltmp1:
 	movq	256(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_11
+	je	.LBB1_11
 	movq	248(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_11:
+.LBB1_11:
 	movq	280(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_16
+	je	.LBB1_16
 	movq	272(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
@@ -189,7 +175,7 @@ core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_ge
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	jmpq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_16:
+.LBB1_16:
 	.cfi_def_cfa_offset 32
 	addq	$8, %rsp
 	.cfi_def_cfa_offset 24
@@ -198,7 +184,7 @@ core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_ge
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB2_13:
+.LBB1_13:
 	.cfi_def_cfa_offset 32
 .Ltmp2:
 	movq	%rax, %r14
@@ -215,16 +201,16 @@ core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_ge
 	movq	%r14, %rdi
 	callq	_Unwind_Resume@PLT
 	ud2
-.LBB2_17:
+.LBB1_17:
 .Ltmp7:
 	callq	*core::panicking::panic_cannot_unwind@GOTPCREL(%rip)
 	ud2
-.Lfunc_end2:
-	.size	core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_get_sparse::A,&query_state_get_sparse::B)>>, .Lfunc_end2-core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_get_sparse::A,&query_state_get_sparse::B)>>
+.Lfunc_end1:
+	.size	core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_get_sparse::A,&query_state_get_sparse::B)>>, .Lfunc_end1-core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_get_sparse::A,&query_state_get_sparse::B)>>
 	.cfi_endproc
 	.section	".gcc_except_table.core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_get_sparse::A,&query_state_get_sparse::B)>>","a",@progbits
 	.p2align	2, 0x0
-GCC_except_table2:
+GCC_except_table1:
 .Lexception0:
 	.byte	255
 	.byte	155
@@ -242,7 +228,7 @@ GCC_except_table2:
 	.uleb128 .Ltmp7-.Lfunc_begin0
 	.byte	1
 	.uleb128 .Ltmp6-.Lfunc_begin0
-	.uleb128 .Lfunc_end2-.Ltmp6
+	.uleb128 .Lfunc_end1-.Ltmp6
 	.byte	0
 	.byte	0
 .Lcst_end0:
@@ -259,14 +245,14 @@ GCC_except_table2:
 core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>:
 	.cfi_startproc
 	testq	%rsi, %rsi
-	je	.LBB3_1
+	je	.LBB2_1
 	shlq	$2, %rsi
 	movl	$4, %edx
 	jmpq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB3_1:
+.LBB2_1:
 	retq
-.Lfunc_end3:
-	.size	core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>, .Lfunc_end3-core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>
+.Lfunc_end2:
+	.size	core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>, .Lfunc_end2-core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>
 	.cfi_endproc
 
 	.section	".text.core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>","ax",@progbits
@@ -275,14 +261,14 @@ core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>:
 core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>:
 	.cfi_startproc
 	testq	%rsi, %rsi
-	je	.LBB4_1
+	je	.LBB3_1
 	shlq	$2, %rsi
 	movl	$4, %edx
 	jmpq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB4_1:
+.LBB3_1:
 	retq
-.Lfunc_end4:
-	.size	core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>, .Lfunc_end4-core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>
+.Lfunc_end3:
+	.size	core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>, .Lfunc_end3-core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>
 	.cfi_endproc
 
 	.section	.text.alloc::raw_vec::finish_grow,"ax",@progbits
@@ -302,41 +288,41 @@ alloc::raw_vec::finish_grow:
 	movq	%rdx, %rbx
 	movq	%rdi, %r14
 	testq	%rsi, %rsi
-	je	.LBB5_6
+	je	.LBB4_6
 	movq	%rsi, %r15
 	cmpq	$0, 8(%rcx)
-	je	.LBB5_7
+	je	.LBB4_7
 	movq	16(%rcx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB5_7
+	je	.LBB4_7
 	movq	(%rcx), %rdi
 	movq	%r15, %rdx
 	movq	%rbx, %rcx
 	callq	*__rust_realloc@GOTPCREL(%rip)
 	testq	%rax, %rax
-	jne	.LBB5_11
-.LBB5_4:
+	jne	.LBB4_11
+.LBB4_4:
 	movq	%r15, 8(%r14)
-	jmp	.LBB5_5
-.LBB5_7:
+	jmp	.LBB4_5
+.LBB4_7:
 	testq	%rbx, %rbx
-	je	.LBB5_8
+	je	.LBB4_8
 	movq	__rust_no_alloc_shim_is_unstable@GOTPCREL(%rip), %rax
 	movzbl	(%rax), %eax
 	movq	%rbx, %rdi
 	movq	%r15, %rsi
 	callq	*__rust_alloc@GOTPCREL(%rip)
 	testq	%rax, %rax
-	je	.LBB5_4
-.LBB5_11:
+	je	.LBB4_4
+.LBB4_11:
 	movq	%rax, 8(%r14)
 	xorl	%eax, %eax
-	jmp	.LBB5_12
-.LBB5_6:
+	jmp	.LBB4_12
+.LBB4_6:
 	movq	$0, 8(%r14)
-.LBB5_5:
+.LBB4_5:
 	movl	$1, %eax
-.LBB5_12:
+.LBB4_12:
 	movq	%rbx, 16(%r14)
 	movq	%rax, (%r14)
 	popq	%rbx
@@ -346,14 +332,14 @@ alloc::raw_vec::finish_grow:
 	popq	%r15
 	.cfi_def_cfa_offset 8
 	retq
-.LBB5_8:
+.LBB4_8:
 	.cfi_def_cfa_offset 32
 	movq	%r15, %rax
 	testq	%rax, %rax
-	jne	.LBB5_11
-	jmp	.LBB5_4
-.Lfunc_end5:
-	.size	alloc::raw_vec::finish_grow, .Lfunc_end5-alloc::raw_vec::finish_grow
+	jne	.LBB4_11
+	jmp	.LBB4_4
+.Lfunc_end4:
+	.size	alloc::raw_vec::finish_grow, .Lfunc_end4-alloc::raw_vec::finish_grow
 	.cfi_endproc
 
 	.section	".text.alloc::raw_vec::RawVec<T,A>::reserve_for_push","ax",@progbits
@@ -370,7 +356,7 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	.cfi_offset %rbx, -24
 	.cfi_offset %r14, -16
 	incq	%rsi
-	je	.LBB6_10
+	je	.LBB5_10
 	movq	%rdi, %rbx
 	movq	8(%rdi), %rax
 	leaq	(%rax,%rax), %rcx
@@ -386,25 +372,25 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	leaq	(,%r14,4), %rdx
 	shlq	$2, %rsi
 	testq	%rax, %rax
-	je	.LBB6_3
+	je	.LBB5_3
 	movq	(%rbx), %rcx
 	shlq	$2, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$4, 16(%rsp)
 	movq	%rax, 24(%rsp)
-	jmp	.LBB6_4
-.LBB6_3:
+	jmp	.LBB5_4
+.LBB5_3:
 	movq	$0, 16(%rsp)
-.LBB6_4:
+.LBB5_4:
 	leaq	32(%rsp), %rdi
 	leaq	8(%rsp), %rcx
 	callq	alloc::raw_vec::finish_grow
 	cmpq	$0, 32(%rsp)
 	movq	40(%rsp), %rdi
-	je	.LBB6_5
+	je	.LBB5_5
 	movabsq	$-9223372036854775807, %rax
 	cmpq	%rax, %rdi
-	jne	.LBB6_8
+	jne	.LBB5_8
 	addq	$56, %rsp
 	.cfi_def_cfa_offset 24
 	popq	%rbx
@@ -412,7 +398,7 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB6_5:
+.LBB5_5:
 	.cfi_def_cfa_offset 80
 	movq	%rdi, (%rbx)
 	movq	%r14, 8(%rbx)
@@ -423,19 +409,19 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB6_8:
+.LBB5_8:
 	.cfi_def_cfa_offset 80
 	testq	%rdi, %rdi
-	jne	.LBB6_9
-.LBB6_10:
+	jne	.LBB5_9
+.LBB5_10:
 	callq	*alloc::raw_vec::capacity_overflow@GOTPCREL(%rip)
 	ud2
-.LBB6_9:
+.LBB5_9:
 	movq	48(%rsp), %rsi
 	callq	*alloc::alloc::handle_alloc_error@GOTPCREL(%rip)
 	ud2
-.Lfunc_end6:
-	.size	alloc::raw_vec::RawVec<T,A>::reserve_for_push, .Lfunc_end6-alloc::raw_vec::RawVec<T,A>::reserve_for_push
+.Lfunc_end5:
+	.size	alloc::raw_vec::RawVec<T,A>::reserve_for_push, .Lfunc_end5-alloc::raw_vec::RawVec<T,A>::reserve_for_push
 	.cfi_endproc
 
 	.section	".text.alloc::raw_vec::RawVec<T,A>::reserve_for_push","ax",@progbits
@@ -452,7 +438,7 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	.cfi_offset %rbx, -24
 	.cfi_offset %r14, -16
 	incq	%rsi
-	je	.LBB7_10
+	je	.LBB6_10
 	movq	%rdi, %rbx
 	movq	8(%rdi), %rax
 	leaq	(%rax,%rax), %rcx
@@ -468,25 +454,25 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	leaq	(,%r14,4), %rdx
 	shlq	$2, %rsi
 	testq	%rax, %rax
-	je	.LBB7_3
+	je	.LBB6_3
 	movq	(%rbx), %rcx
 	shlq	$2, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$4, 16(%rsp)
 	movq	%rax, 24(%rsp)
-	jmp	.LBB7_4
-.LBB7_3:
+	jmp	.LBB6_4
+.LBB6_3:
 	movq	$0, 16(%rsp)
-.LBB7_4:
+.LBB6_4:
 	leaq	32(%rsp), %rdi
 	leaq	8(%rsp), %rcx
 	callq	alloc::raw_vec::finish_grow
 	cmpq	$0, 32(%rsp)
 	movq	40(%rsp), %rdi
-	je	.LBB7_5
+	je	.LBB6_5
 	movabsq	$-9223372036854775807, %rax
 	cmpq	%rax, %rdi
-	jne	.LBB7_8
+	jne	.LBB6_8
 	addq	$56, %rsp
 	.cfi_def_cfa_offset 24
 	popq	%rbx
@@ -494,7 +480,7 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB7_5:
+.LBB6_5:
 	.cfi_def_cfa_offset 80
 	movq	%rdi, (%rbx)
 	movq	%r14, 8(%rbx)
@@ -505,19 +491,19 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB7_8:
+.LBB6_8:
 	.cfi_def_cfa_offset 80
 	testq	%rdi, %rdi
-	jne	.LBB7_9
-.LBB7_10:
+	jne	.LBB6_9
+.LBB6_10:
 	callq	*alloc::raw_vec::capacity_overflow@GOTPCREL(%rip)
 	ud2
-.LBB7_9:
+.LBB6_9:
 	movq	48(%rsp), %rsi
 	callq	*alloc::alloc::handle_alloc_error@GOTPCREL(%rip)
 	ud2
-.Lfunc_end7:
-	.size	alloc::raw_vec::RawVec<T,A>::reserve_for_push, .Lfunc_end7-alloc::raw_vec::RawVec<T,A>::reserve_for_push
+.Lfunc_end6:
+	.size	alloc::raw_vec::RawVec<T,A>::reserve_for_push, .Lfunc_end6-alloc::raw_vec::RawVec<T,A>::reserve_for_push
 	.cfi_endproc
 
 	.section	.text.query_get,"ax",@progbits
@@ -551,82 +537,83 @@ query_get:
 	.cfi_offset %rbp, -16
 	movl	%edx, 92(%rsp)
 	movq	%rsi, 208(%rsp)
-	movq	(%rdi), %rax
-	cmpq	752(%rcx), %rax
-	movq	%rdi, (%rsp)
-	jne	.LBB8_80
 	movq	%rdi, %r15
-	movq	%rcx, 160(%rsp)
+	movq	752(%rcx), %rsi
+	movq	(%rdi), %rdi
+	cmpq	%rsi, %rdi
+	jne	.LBB7_78
+	movq	%rcx, 112(%rsp)
 	movq	168(%rcx), %rsi
-	movq	8(%rdi), %rbp
-	movq	%rsi, 8(%rdi)
+	movq	8(%r15), %rbp
+	movq	%rsi, 8(%r15)
 	cmpq	%rsi, %rbp
-	jae	.LBB8_38
+	jae	.LBB7_38
 	leaq	80(%r15), %rax
 	movq	%rax, 72(%rsp)
 	leaq	104(%r15), %rax
 	movq	%rax, 64(%rsp)
 	leaq	112(%r15), %rax
-	movq	%rax, 184(%rsp)
+	movq	%rax, 136(%rsp)
 	leaq	136(%r15), %rax
-	movq	%rax, 168(%rsp)
+	movq	%rax, 120(%rsp)
 	leaq	312(%r15), %rax
 	movq	%rax, 232(%rsp)
 	leaq	48(%r15), %rax
 	movq	%rax, 224(%rsp)
 	leaq	72(%r15), %rax
-	movq	%rax, 152(%rsp)
+	movq	%rax, 104(%rsp)
 	leaq	272(%r15), %rax
 	movq	%rax, 200(%rsp)
 	leaq	16(%r15), %rax
 	movq	%rax, 216(%rsp)
 	leaq	40(%r15), %rax
-	movq	%rax, 144(%rsp)
+	movq	%rax, 96(%rsp)
 	leaq	248(%r15), %rax
 	movq	%rax, 192(%rsp)
-	movq	160(%rsp), %rax
+	movq	112(%rsp), %rax
 	movq	152(%rax), %rax
-	movq	%rax, 8(%rsp)
-	movq	%rsi, 176(%rsp)
-	jmp	.LBB8_6
-.LBB8_3:
-	movq	(%rsp), %r15
+	movq	%rax, 24(%rsp)
+	movq	%r15, 16(%rsp)
+	movq	%rsi, 128(%rsp)
+	jmp	.LBB7_6
+.LBB7_3:
+	movq	16(%rsp), %r15
 	movq	264(%r15), %rsi
-.LBB8_4:
+.LBB7_4:
 	movq	248(%r15), %rax
 	movl	%r14d, (%rax,%rsi,4)
 	incq	%rsi
 	movq	%rsi, 264(%r15)
-	movq	176(%rsp), %rsi
+	movq	128(%rsp), %rsi
 	.p2align	4, 0x90
-.LBB8_5:
+.LBB7_5:
 	incq	%rbp
 	cmpq	%rbp, %rsi
-	je	.LBB8_38
-.LBB8_6:
+	je	.LBB7_38
+.LBB7_6:
 	movl	%ebp, %edi
 	cmpq	%rsi, %rdi
-	jae	.LBB8_70
+	jae	.LBB7_70
 	imulq	$152, %rdi, %rdi
 	movq	296(%r15), %rax
-	movq	8(%rsp), %rcx
+	movq	24(%rsp), %rcx
 	movq	136(%rcx,%rdi), %rcx
 	cmpq	%rax, %rcx
-	jbe	.LBB8_5
-	movq	8(%rsp), %rdx
+	jbe	.LBB7_5
+	movq	24(%rsp), %rdx
 	movq	128(%rdx,%rdi), %r12
 	testq	%r12, %r12
-	je	.LBB8_5
+	je	.LBB7_5
 	shlq	$4, %rax
 	cmpq	$0, (%r12,%rax)
-	je	.LBB8_5
+	je	.LBB7_5
 	movq	304(%r15), %r13
 	cmpq	%r13, %rcx
-	jbe	.LBB8_5
+	jbe	.LBB7_5
 	shlq	$4, %r13
 	cmpq	$0, (%r12,%r13)
-	je	.LBB8_5
-	movq	8(%rsp), %rcx
+	je	.LBB7_5
+	movq	24(%rsp), %rcx
 	movq	%rdi, 80(%rsp)
 	movq	96(%rcx,%rdi), %rcx
 	movq	8(%r12,%rax), %rax
@@ -634,15 +621,15 @@ query_get:
 	movq	%rcx, 240(%rsp)
 	movq	(%rcx,%rax), %r15
 	leaq	1(%r15), %rbx
-.Ltmp10:
+.Ltmp12:
 	movq	72(%rsp), %rdi
 	movq	%rbx, %rsi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp11:
-	movq	%r15, 48(%rsp)
+.Ltmp13:
+	movq	%r15, 8(%rsp)
 	movq	64(%rsp), %rax
 	cmpq	%r15, (%rax)
-	jbe	.LBB8_71
+	jbe	.LBB7_71
 	movq	%rbx, %rsi
 	movq	%r15, %r14
 	shrq	$5, %r14
@@ -652,34 +639,34 @@ query_get:
 	movq	72(%rsp), %rax
 	movq	(%rax), %rax
 	orl	%ebx, (%rax,%r14,4)
-.Ltmp12:
-	movq	184(%rsp), %rdi
+.Ltmp14:
+	movq	136(%rsp), %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp13:
-	movq	%r15, 48(%rsp)
-	movq	168(%rsp), %rax
+.Ltmp15:
+	movq	%r15, 8(%rsp)
+	movq	120(%rsp), %rax
 	cmpq	%r15, (%rax)
-	jbe	.LBB8_72
-	movq	184(%rsp), %rax
+	jbe	.LBB7_72
+	movq	136(%rsp), %rax
 	movq	(%rax), %rax
 	orl	%ebx, (%rax,%r14,4)
 	leaq	(%r12,%r13), %rax
 	cmpq	$0, (%rax)
 	movq	72(%rsp), %rdx
-	je	.LBB8_20
+	je	.LBB7_20
 	movq	8(%r12,%r13), %rax
 	shlq	$4, %rax
 	movq	240(%rsp), %rcx
 	movq	(%rcx,%rax), %r14
 	leaq	1(%r14), %rsi
-.Ltmp14:
+.Ltmp16:
 	movq	%rdx, %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp15:
-	movq	%r14, 48(%rsp)
+.Ltmp17:
+	movq	%r14, 8(%rsp)
 	movq	64(%rsp), %rax
 	cmpq	%r14, (%rax)
-	jbe	.LBB8_71
+	jbe	.LBB7_71
 	movl	$1, %eax
 	movl	%r14d, %ecx
 	shll	%cl, %eax
@@ -687,158 +674,158 @@ query_get:
 	movq	(%rdx), %rcx
 	shrq	$5, %r14
 	orl	%eax, (%rcx,%r14,4)
-.LBB8_20:
-.Ltmp16:
-	movq	8(%rsp), %rax
+.LBB7_20:
+.Ltmp18:
+	movq	24(%rsp), %rax
 	movq	80(%rsp), %rcx
 	leaq	(%rax,%rcx), %rsi
 	movq	232(%rsp), %rdi
 	callq	*<() as bevy_ecs::query::fetch::WorldQuery>::update_archetype_component_access@GOTPCREL(%rip)
-.Ltmp17:
-	movq	8(%rsp), %rax
+.Ltmp19:
+	movq	24(%rsp), %rax
 	movq	80(%rsp), %rdx
 	movl	144(%rax,%rdx), %r14d
 	movq	%r14, %r15
 	shrq	$5, %r15
-	movq	(%rsp), %rcx
+	movq	16(%rsp), %rcx
 	cmpq	64(%rcx), %r15
-	jae	.LBB8_24
+	jae	.LBB7_24
 	movq	48(%rcx), %rax
 	testq	%rax, %rax
-	je	.LBB8_24
+	je	.LBB7_24
 	movl	(%rax,%r15,4), %eax
 	btl	%r14d, %eax
-	jb	.LBB8_31
-.LBB8_24:
+	jb	.LBB7_31
+.LBB7_24:
 	leaq	1(%r14), %rsi
-.Ltmp18:
+.Ltmp20:
 	movq	224(%rsp), %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp19:
-	movq	%r14, 48(%rsp)
-	movq	152(%rsp), %rax
+.Ltmp21:
+	movq	%r14, 8(%rsp)
+	movq	104(%rsp), %rax
 	cmpq	%r14, (%rax)
-	jbe	.LBB8_74
+	jbe	.LBB7_74
 	movl	$1, %eax
 	movl	%r14d, %ecx
 	shll	%cl, %eax
-	movq	(%rsp), %rdx
+	movq	16(%rsp), %rdx
 	movq	48(%rdx), %rcx
 	orl	%eax, (%rcx,%r15,4)
 	movq	288(%rdx), %rsi
 	cmpq	280(%rdx), %rsi
-	jne	.LBB8_29
-.Ltmp20:
+	jne	.LBB7_29
+.Ltmp22:
 	movq	200(%rsp), %rdi
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
-.Ltmp21:
-	movq	(%rsp), %rcx
+.Ltmp23:
+	movq	16(%rsp), %rcx
 	movq	288(%rcx), %rsi
-	jmp	.LBB8_30
-.LBB8_29:
+	jmp	.LBB7_30
+.LBB7_29:
 	movq	%rdx, %rcx
-.LBB8_30:
+.LBB7_30:
 	movq	272(%rcx), %rax
 	movl	%r14d, (%rax,%rsi,4)
 	incq	%rsi
 	movq	%rsi, 288(%rcx)
 	movq	80(%rsp), %rdx
-.LBB8_31:
-	movq	8(%rsp), %rax
+.LBB7_31:
+	movq	24(%rsp), %rax
 	movl	148(%rax,%rdx), %r14d
 	movq	%r14, %rbx
 	shrq	$5, %rbx
 	cmpq	32(%rcx), %rbx
-	movq	176(%rsp), %rsi
-	jae	.LBB8_34
+	movq	128(%rsp), %rsi
+	jae	.LBB7_34
 	movq	%rcx, %r15
 	movq	16(%rcx), %rax
 	testq	%rax, %rax
-	je	.LBB8_34
+	je	.LBB7_34
 	movl	(%rax,%rbx,4), %eax
 	btl	%r14d, %eax
-	jb	.LBB8_5
-.LBB8_34:
+	jb	.LBB7_5
+.LBB7_34:
 	leaq	1(%r14), %rsi
-.Ltmp22:
+.Ltmp24:
 	movq	216(%rsp), %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp23:
-	movq	%r14, 48(%rsp)
-	movq	144(%rsp), %rax
+.Ltmp25:
+	movq	%r14, 8(%rsp)
+	movq	96(%rsp), %rax
 	cmpq	%r14, (%rax)
-	jbe	.LBB8_75
+	jbe	.LBB7_75
 	movl	$1, %eax
 	movl	%r14d, %ecx
 	shll	%cl, %eax
-	movq	(%rsp), %r15
+	movq	16(%rsp), %r15
 	movq	16(%r15), %rcx
 	orl	%eax, (%rcx,%rbx,4)
 	movq	264(%r15), %rsi
 	cmpq	256(%r15), %rsi
-	jne	.LBB8_4
-.Ltmp27:
+	jne	.LBB7_4
+.Ltmp29:
 	movq	192(%rsp), %rdi
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
-.Ltmp28:
-	jmp	.LBB8_3
-.LBB8_38:
-	movq	160(%rsp), %rbx
+.Ltmp30:
+	jmp	.LBB7_3
+.LBB7_38:
+	movq	112(%rsp), %rbx
 	movl	760(%rbx), %eax
 	movl	764(%rbx), %ecx
 	movl	92(%rsp), %edx
 	cmpq	%rdx, 16(%rbx)
 	movq	208(%rsp), %r11
-	jbe	.LBB8_48
+	jbe	.LBB7_48
 	movq	(%rbx), %rsi
 	leaq	(%rdx,%rdx,4), %rdi
 	cmpl	%r11d, (%rsi,%rdi,4)
-	jne	.LBB8_48
+	jne	.LBB7_48
 	movl	4(%rsi,%rdi,4), %esi
 	movl	$4294967295, %edi
 	cmpq	%rdi, %rsi
-	je	.LBB8_48
+	je	.LBB7_48
 	movq	%rsi, %rdi
 	shrq	$5, %rdi
 	cmpq	64(%r15), %rdi
-	jae	.LBB8_51
+	jae	.LBB7_51
 	movq	48(%r15), %r8
 	testq	%r8, %r8
-	je	.LBB8_51
+	je	.LBB7_51
 	movl	(%r8,%rdi,4), %edi
 	btl	%esi, %edi
-	jae	.LBB8_51
+	jae	.LBB7_51
 	movq	296(%r15), %r8
 	movq	304(%r15), %rsi
 	movq	264(%rbx), %rdi
 	movq	280(%rbx), %r10
 	xorl	%r9d, %r9d
 	cmpq	%r8, %r10
-	jbe	.LBB8_53
+	jbe	.LBB7_53
 	testq	%rdi, %rdi
-	je	.LBB8_53
+	je	.LBB7_53
 	shlq	$4, %r8
 	cmpq	$0, (%rdi,%r8)
-	je	.LBB8_52
+	je	.LBB7_52
 	movq	8(%rdi,%r8), %r8
 	leaq	(%r8,%r8,8), %r9
 	shlq	$4, %r9
 	addq	216(%rbx), %r9
-	jmp	.LBB8_53
-.LBB8_48:
+	jmp	.LBB7_53
+.LBB7_48:
 	shlq	$32, %r11
 	orq	$1, %r11
-.LBB8_49:
+.LBB7_49:
 	xorl	%esi, %esi
 	movq	%rdx, %rdi
-.LBB8_50:
-	movq	%rsi, 96(%rsp)
-	movq	%r11, 104(%rsp)
-	movq	%rdi, 112(%rsp)
-	movl	%ecx, 120(%rsp)
-	movl	%eax, 124(%rsp)
-	movq	%r9, 128(%rsp)
-	leaq	96(%rsp), %rax
+.LBB7_50:
+	movq	%rsi, 144(%rsp)
+	movq	%r11, 152(%rsp)
+	movq	%rdi, 160(%rsp)
+	movl	%ecx, 168(%rsp)
+	movl	%eax, 172(%rsp)
+	movq	%r9, 176(%rsp)
+	leaq	144(%rsp), %rax
 	#APP
 	#NO_APP
 	movq	%r15, %rdi
@@ -858,37 +845,37 @@ query_get:
 	popq	%rbp
 	.cfi_def_cfa_offset 8
 	retq
-.LBB8_51:
+.LBB7_51:
 	.cfi_def_cfa_offset 304
 	shlq	$32, %r11
-	jmp	.LBB8_49
-.LBB8_52:
+	jmp	.LBB7_49
+.LBB7_52:
 	xorl	%r9d, %r9d
-.LBB8_53:
+.LBB7_53:
 	xorl	%r8d, %r8d
 	cmpq	%rsi, %r10
-	jbe	.LBB8_58
+	jbe	.LBB7_58
 	testq	%rdi, %rdi
-	je	.LBB8_58
+	je	.LBB7_58
 	shlq	$4, %rsi
 	cmpq	$0, (%rdi,%rsi)
-	je	.LBB8_57
+	je	.LBB7_57
 	movq	8(%rdi,%rsi), %rsi
 	leaq	(%rsi,%rsi,8), %r8
 	shlq	$4, %r8
 	addq	216(%rbx), %r8
-	jmp	.LBB8_58
-.LBB8_57:
+	jmp	.LBB7_58
+.LBB7_57:
 	xorl	%r8d, %r8d
-.LBB8_58:
+.LBB7_58:
 	xorl	%esi, %esi
 	cmpq	%rdx, 136(%r9)
-	jbe	.LBB8_64
+	jbe	.LBB7_64
 	movq	120(%r9), %r10
 	testq	%r10, %r10
-	je	.LBB8_65
+	je	.LBB7_65
 	cmpl	$0, (%r10,%rdx,8)
-	je	.LBB8_63
+	je	.LBB7_63
 	movl	4(%r10,%rdx,8), %edi
 	movq	8(%r9), %rsi
 	imulq	%rdi, %rsi
@@ -897,126 +884,116 @@ query_get:
 	movq	48(%r9), %r11
 	addq	%rdi, %r11
 	addq	72(%r9), %rdi
-	jmp	.LBB8_65
-.LBB8_63:
+	jmp	.LBB7_65
+.LBB7_63:
 	xorl	%esi, %esi
-.LBB8_64:
-.LBB8_65:
+.LBB7_64:
+.LBB7_65:
 	xorl	%r9d, %r9d
 	cmpq	%rdx, 136(%r8)
-	jbe	.LBB8_50
+	jbe	.LBB7_50
 	movq	120(%r8), %r10
 	testq	%r10, %r10
-	je	.LBB8_50
+	je	.LBB7_50
 	cmpl	$0, (%r10,%rdx,8)
-	je	.LBB8_69
+	je	.LBB7_69
 	movl	4(%r10,%rdx,8), %r9d
 	imulq	8(%r8), %r9
 	addq	16(%r8), %r9
-	jmp	.LBB8_50
-.LBB8_69:
+	jmp	.LBB7_50
+.LBB7_69:
 	xorl	%r9d, %r9d
-	jmp	.LBB8_50
-.LBB8_70:
-.Ltmp8:
-	leaq	.Lanon.161d7961c923b4e842c0f6e55225f2ee.14(%rip), %rdx
+	jmp	.LBB7_50
+.LBB7_70:
+.Ltmp10:
+	leaq	.Lanon.161d7961c923b4e842c0f6e55225f2ee.9(%rip), %rdx
 	callq	*core::panicking::panic_bounds_check@GOTPCREL(%rip)
-.Ltmp9:
-	jmp	.LBB8_79
-.LBB8_71:
-	leaq	48(%rsp), %rax
-	movq	%rax, 16(%rsp)
+.Ltmp11:
+	jmp	.LBB7_79
+.LBB7_71:
+	leaq	8(%rsp), %rax
+	movq	%rax, 32(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
-	movq	%rax, 24(%rsp)
+	movq	%rax, 40(%rsp)
 	movq	64(%rsp), %rcx
-	jmp	.LBB8_73
-.LBB8_72:
-	leaq	48(%rsp), %rax
-	movq	%rax, 16(%rsp)
+	jmp	.LBB7_73
+.LBB7_72:
+	leaq	8(%rsp), %rax
+	movq	%rax, 32(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
-	movq	%rax, 24(%rsp)
-	movq	168(%rsp), %rcx
-.LBB8_73:
-	movq	%rcx, 32(%rsp)
 	movq	%rax, 40(%rsp)
+	movq	120(%rsp), %rcx
+.LBB7_73:
+	movq	%rcx, 48(%rsp)
+	movq	%rax, 56(%rsp)
 	leaq	.Lanon.161d7961c923b4e842c0f6e55225f2ee.6(%rip), %rax
-	movq	%rax, 96(%rsp)
+	movq	%rax, 144(%rsp)
 	leaq	.Lanon.161d7961c923b4e842c0f6e55225f2ee.7(%rip), %rsi
-	jmp	.LBB8_77
-.LBB8_74:
-	leaq	48(%rsp), %rax
-	movq	%rax, 16(%rsp)
+	jmp	.LBB7_77
+.LBB7_74:
+	leaq	8(%rsp), %rax
+	movq	%rax, 32(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
-	movq	%rax, 24(%rsp)
-	movq	152(%rsp), %rcx
-	jmp	.LBB8_76
-.LBB8_75:
-	leaq	48(%rsp), %rax
-	movq	%rax, 16(%rsp)
+	movq	%rax, 40(%rsp)
+	movq	104(%rsp), %rcx
+	jmp	.LBB7_76
+.LBB7_75:
+	leaq	8(%rsp), %rax
+	movq	%rax, 32(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
-	movq	%rax, 24(%rsp)
-	movq	144(%rsp), %rcx
-.LBB8_76:
-	movq	%rcx, 32(%rsp)
 	movq	%rax, 40(%rsp)
+	movq	96(%rsp), %rcx
+.LBB7_76:
+	movq	%rcx, 48(%rsp)
+	movq	%rax, 56(%rsp)
 	leaq	.Lanon.161d7961c923b4e842c0f6e55225f2ee.2(%rip), %rax
-	movq	%rax, 96(%rsp)
+	movq	%rax, 144(%rsp)
 	leaq	.Lanon.161d7961c923b4e842c0f6e55225f2ee.4(%rip), %rsi
-.LBB8_77:
-	movl	$2, %eax
-	leaq	16(%rsp), %rcx
-.LBB8_78:
-	leaq	96(%rsp), %rdi
+.LBB7_77:
+	leaq	32(%rsp), %rax
+	leaq	144(%rsp), %rdi
 	movq	$2, 8(%rdi)
 	movq	$0, 32(%rdi)
-	movq	%rcx, 16(%rdi)
-	movq	%rax, 24(%rdi)
-.Ltmp24:
-	movq	(%rsp), %r15
+	movq	%rax, 16(%rdi)
+	movq	$2, 24(%rdi)
+.Ltmp26:
+	movq	16(%rsp), %r15
 	callq	*core::panicking::panic_fmt@GOTPCREL(%rip)
-.Ltmp25:
-.LBB8_79:
+.Ltmp27:
+	jmp	.LBB7_79
+.LBB7_78:
+.Ltmp8:
+	leaq	.Lanon.161d7961c923b4e842c0f6e55225f2ee.10(%rip), %rdx
+	callq	*bevy_ecs::query::state::QueryState<Q,F>::validate_world::panic_mismatched@GOTPCREL(%rip)
+.Ltmp9:
+.LBB7_79:
 	ud2
-.LBB8_80:
-	leaq	.Lanon.161d7961c923b4e842c0f6e55225f2ee.11(%rip), %rax
-	movq	%rax, 16(%rsp)
-	movq	$96, 24(%rsp)
-	leaq	16(%rsp), %rax
-	movq	%rax, 48(%rsp)
-	leaq	<&T as core::fmt::Display>::fmt(%rip), %rax
-	movq	%rax, 56(%rsp)
-	leaq	.Lanon.161d7961c923b4e842c0f6e55225f2ee.10(%rip), %rax
-	movq	%rax, 96(%rsp)
-	leaq	.Lanon.161d7961c923b4e842c0f6e55225f2ee.13(%rip), %rsi
-	movl	$1, %eax
-	leaq	48(%rsp), %rcx
-	jmp	.LBB8_78
-.LBB8_81:
-.Ltmp29:
+.LBB7_80:
+.Ltmp31:
 	movq	%rax, %r14
-	movq	(%rsp), %r15
-	jmp	.LBB8_83
-.LBB8_82:
-.Ltmp26:
+	movq	16(%rsp), %r15
+	jmp	.LBB7_82
+.LBB7_81:
+.Ltmp28:
 	movq	%rax, %r14
-.LBB8_83:
-.Ltmp30:
+.LBB7_82:
+.Ltmp32:
 	movq	%r15, %rdi
 	callq	core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_get_sparse::A,&query_state_get_sparse::B)>>
-.Ltmp31:
+.Ltmp33:
 	movq	%r14, %rdi
 	callq	_Unwind_Resume@PLT
 	ud2
-.LBB8_85:
-.Ltmp32:
+.LBB7_84:
+.Ltmp34:
 	callq	*core::panicking::panic_cannot_unwind@GOTPCREL(%rip)
 	ud2
-.Lfunc_end8:
-	.size	query_get, .Lfunc_end8-query_get
+.Lfunc_end7:
+	.size	query_get, .Lfunc_end7-query_get
 	.cfi_endproc
 	.section	.gcc_except_table.query_get,"a",@progbits
 	.p2align	2, 0x0
-GCC_except_table8:
+GCC_except_table7:
 .Lexception1:
 	.byte	255
 	.byte	155
@@ -1025,24 +1002,24 @@ GCC_except_table8:
 	.byte	1
 	.uleb128 .Lcst_end1-.Lcst_begin1
 .Lcst_begin1:
-	.uleb128 .Ltmp10-.Lfunc_begin1
-	.uleb128 .Ltmp28-.Ltmp10
-	.uleb128 .Ltmp29-.Lfunc_begin1
+	.uleb128 .Ltmp12-.Lfunc_begin1
+	.uleb128 .Ltmp30-.Ltmp12
+	.uleb128 .Ltmp31-.Lfunc_begin1
 	.byte	0
-	.uleb128 .Ltmp28-.Lfunc_begin1
-	.uleb128 .Ltmp8-.Ltmp28
+	.uleb128 .Ltmp30-.Lfunc_begin1
+	.uleb128 .Ltmp10-.Ltmp30
 	.byte	0
 	.byte	0
-	.uleb128 .Ltmp8-.Lfunc_begin1
-	.uleb128 .Ltmp25-.Ltmp8
-	.uleb128 .Ltmp26-.Lfunc_begin1
+	.uleb128 .Ltmp10-.Lfunc_begin1
+	.uleb128 .Ltmp9-.Ltmp10
+	.uleb128 .Ltmp28-.Lfunc_begin1
 	.byte	0
-	.uleb128 .Ltmp30-.Lfunc_begin1
-	.uleb128 .Ltmp31-.Ltmp30
 	.uleb128 .Ltmp32-.Lfunc_begin1
+	.uleb128 .Ltmp33-.Ltmp32
+	.uleb128 .Ltmp34-.Lfunc_begin1
 	.byte	1
-	.uleb128 .Ltmp31-.Lfunc_begin1
-	.uleb128 .Lfunc_end8-.Ltmp31
+	.uleb128 .Ltmp33-.Lfunc_begin1
+	.uleb128 .Lfunc_end7-.Ltmp33
 	.byte	0
 	.byte	0
 .Lcst_end1:
@@ -1116,52 +1093,24 @@ GCC_except_table8:
 	.type	.Lanon.161d7961c923b4e842c0f6e55225f2ee.8,@object
 	.section	.rodata..Lanon.161d7961c923b4e842c0f6e55225f2ee.8,"a",@progbits
 .Lanon.161d7961c923b4e842c0f6e55225f2ee.8:
-	.ascii	"Attempted to use "
-	.size	.Lanon.161d7961c923b4e842c0f6e55225f2ee.8, 17
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-41530a2346942c86/c9f9133/crates/bevy_ecs/src/query/state.rs"
+	.size	.Lanon.161d7961c923b4e842c0f6e55225f2ee.8, 97
 
 	.type	.Lanon.161d7961c923b4e842c0f6e55225f2ee.9,@object
-	.section	.rodata..Lanon.161d7961c923b4e842c0f6e55225f2ee.9,"a",@progbits
+	.section	.data.rel.ro..Lanon.161d7961c923b4e842c0f6e55225f2ee.9,"aw",@progbits
+	.p2align	3, 0x0
 .Lanon.161d7961c923b4e842c0f6e55225f2ee.9:
-	.ascii	" with a mismatched World. QueryStates can only be used with the World they were created from."
-	.size	.Lanon.161d7961c923b4e842c0f6e55225f2ee.9, 93
+	.quad	.Lanon.161d7961c923b4e842c0f6e55225f2ee.8
+	.asciz	"a\000\000\000\000\000\000\000\330\000\000\000!\000\000"
+	.size	.Lanon.161d7961c923b4e842c0f6e55225f2ee.9, 24
 
 	.type	.Lanon.161d7961c923b4e842c0f6e55225f2ee.10,@object
 	.section	.data.rel.ro..Lanon.161d7961c923b4e842c0f6e55225f2ee.10,"aw",@progbits
 	.p2align	3, 0x0
 .Lanon.161d7961c923b4e842c0f6e55225f2ee.10:
 	.quad	.Lanon.161d7961c923b4e842c0f6e55225f2ee.8
-	.asciz	"\021\000\000\000\000\000\000"
-	.quad	.Lanon.161d7961c923b4e842c0f6e55225f2ee.9
-	.asciz	"]\000\000\000\000\000\000"
-	.size	.Lanon.161d7961c923b4e842c0f6e55225f2ee.10, 32
-
-	.type	.Lanon.161d7961c923b4e842c0f6e55225f2ee.11,@object
-	.section	.rodata..Lanon.161d7961c923b4e842c0f6e55225f2ee.11,"a",@progbits
-.Lanon.161d7961c923b4e842c0f6e55225f2ee.11:
-	.ascii	"bevy_ecs::query::state::QueryState<(&mut query_state_get_sparse::A, &query_state_get_sparse::B)>"
-	.size	.Lanon.161d7961c923b4e842c0f6e55225f2ee.11, 96
-
-	.type	.Lanon.161d7961c923b4e842c0f6e55225f2ee.12,@object
-	.section	.rodata..Lanon.161d7961c923b4e842c0f6e55225f2ee.12,"a",@progbits
-.Lanon.161d7961c923b4e842c0f6e55225f2ee.12:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/0607116/crates/bevy_ecs/src/query/state.rs"
-	.size	.Lanon.161d7961c923b4e842c0f6e55225f2ee.12, 97
-
-	.type	.Lanon.161d7961c923b4e842c0f6e55225f2ee.13,@object
-	.section	.data.rel.ro..Lanon.161d7961c923b4e842c0f6e55225f2ee.13,"aw",@progbits
-	.p2align	3, 0x0
-.Lanon.161d7961c923b4e842c0f6e55225f2ee.13:
-	.quad	.Lanon.161d7961c923b4e842c0f6e55225f2ee.12
-	.asciz	"a\000\000\000\000\000\000\000\344\000\000\000\t\000\000"
-	.size	.Lanon.161d7961c923b4e842c0f6e55225f2ee.13, 24
-
-	.type	.Lanon.161d7961c923b4e842c0f6e55225f2ee.14,@object
-	.section	.data.rel.ro..Lanon.161d7961c923b4e842c0f6e55225f2ee.14,"aw",@progbits
-	.p2align	3, 0x0
-.Lanon.161d7961c923b4e842c0f6e55225f2ee.14:
-	.quad	.Lanon.161d7961c923b4e842c0f6e55225f2ee.12
-	.asciz	"a\000\000\000\000\000\000\000\330\000\000\000!\000\000"
-	.size	.Lanon.161d7961c923b4e842c0f6e55225f2ee.14, 24
+	.asciz	"a\000\000\000\000\000\000\000\321\000\000\000\016\000\000"
+	.size	.Lanon.161d7961c923b4e842c0f6e55225f2ee.10, 24
 
 	.hidden	DW.ref.rust_eh_personality
 	.weak	DW.ref.rust_eh_personality
diff --git a/results/query_state_iter.s b/results/query_state_iter.s
index 0b1a702..d7cf820 100644
--- a/results/query_state_iter.s
+++ b/results/query_state_iter.s
@@ -1,19 +1,5 @@
 	.text
-	.file	"query_state_iter.1847d5bbbb64b628-cgu.0"
-	.section	".text.<&T as core::fmt::Display>::fmt","ax",@progbits
-	.p2align	4, 0x90
-	.type	<&T as core::fmt::Display>::fmt,@function
-<&T as core::fmt::Display>::fmt:
-	.cfi_startproc
-	movq	%rsi, %rdx
-	movq	(%rdi), %rax
-	movq	8(%rdi), %rsi
-	movq	%rax, %rdi
-	jmpq	*<str as core::fmt::Display>::fmt@GOTPCREL(%rip)
-.Lfunc_end0:
-	.size	<&T as core::fmt::Display>::fmt, .Lfunc_end0-<&T as core::fmt::Display>::fmt
-	.cfi_endproc
-
+	.file	"query_state_iter.d27bca44455c0c20-cgu.0"
 	.section	".text.core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>","ax",@progbits
 	.p2align	4, 0x90
 	.type	core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>,@function
@@ -37,53 +23,53 @@ core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::compo
 	movq	%rdi, %rbx
 	movq	32(%rdi), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_2
+	je	.LBB0_2
 	movq	24(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB1_2:
+.LBB0_2:
 	movq	64(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_4
+	je	.LBB0_4
 	movq	56(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB1_4:
+.LBB0_4:
 	movq	(%rbx), %r14
 	movq	16(%rbx), %r15
 	testq	%r15, %r15
-	je	.LBB1_11
+	je	.LBB0_11
 	leaq	40(%r14), %r12
 	movq	__rust_dealloc@GOTPCREL(%rip), %r13
-	jmp	.LBB1_6
+	jmp	.LBB0_6
 	.p2align	4, 0x90
-.LBB1_10:
+.LBB0_10:
 	addq	$64, %r12
 	decq	%r15
-	je	.LBB1_11
-.LBB1_6:
+	je	.LBB0_11
+.LBB0_6:
 	movq	-32(%r12), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_8
+	je	.LBB0_8
 	movq	-40(%r12), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*%r13
-.LBB1_8:
+.LBB0_8:
 	movq	(%r12), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_10
+	je	.LBB0_10
 	movq	-8(%r12), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*%r13
-	jmp	.LBB1_10
-.LBB1_11:
+	jmp	.LBB0_10
+.LBB0_11:
 	movq	8(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_12
+	je	.LBB0_12
 	shlq	$6, %rsi
 	movl	$8, %edx
 	movq	%r14, %rdi
@@ -98,7 +84,7 @@ core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::compo
 	popq	%r15
 	.cfi_def_cfa_offset 8
 	jmpq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB1_12:
+.LBB0_12:
 	.cfi_def_cfa_offset 48
 	popq	%rbx
 	.cfi_def_cfa_offset 40
@@ -111,8 +97,8 @@ core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::compo
 	popq	%r15
 	.cfi_def_cfa_offset 8
 	retq
-.Lfunc_end1:
-	.size	core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>, .Lfunc_end1-core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>
+.Lfunc_end0:
+	.size	core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>, .Lfunc_end0-core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>
 	.cfi_endproc
 
 	.section	".text.core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_iter::A,&query_state_iter::B)>>","ax",@progbits
@@ -134,51 +120,51 @@ core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_it
 	movq	%rdi, %rbx
 	movq	24(%rdi), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_2
+	je	.LBB1_2
 	movq	16(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_2:
+.LBB1_2:
 	movq	56(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_4
+	je	.LBB1_4
 	movq	48(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_4:
+.LBB1_4:
 	movq	88(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_6
+	je	.LBB1_6
 	movq	80(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_6:
+.LBB1_6:
 	movq	120(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_8
+	je	.LBB1_8
 	movq	112(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_8:
+.LBB1_8:
 	leaq	152(%rbx), %rdi
 .Ltmp0:
 	callq	core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>
 .Ltmp1:
 	movq	256(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_11
+	je	.LBB1_11
 	movq	248(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_11:
+.LBB1_11:
 	movq	280(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_16
+	je	.LBB1_16
 	movq	272(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
@@ -189,7 +175,7 @@ core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_it
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	jmpq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_16:
+.LBB1_16:
 	.cfi_def_cfa_offset 32
 	addq	$8, %rsp
 	.cfi_def_cfa_offset 24
@@ -198,7 +184,7 @@ core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_it
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB2_13:
+.LBB1_13:
 	.cfi_def_cfa_offset 32
 .Ltmp2:
 	movq	%rax, %r14
@@ -215,16 +201,16 @@ core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_it
 	movq	%r14, %rdi
 	callq	_Unwind_Resume@PLT
 	ud2
-.LBB2_17:
+.LBB1_17:
 .Ltmp7:
 	callq	*core::panicking::panic_cannot_unwind@GOTPCREL(%rip)
 	ud2
-.Lfunc_end2:
-	.size	core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_iter::A,&query_state_iter::B)>>, .Lfunc_end2-core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_iter::A,&query_state_iter::B)>>
+.Lfunc_end1:
+	.size	core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_iter::A,&query_state_iter::B)>>, .Lfunc_end1-core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_iter::A,&query_state_iter::B)>>
 	.cfi_endproc
 	.section	".gcc_except_table.core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_iter::A,&query_state_iter::B)>>","a",@progbits
 	.p2align	2, 0x0
-GCC_except_table2:
+GCC_except_table1:
 .Lexception0:
 	.byte	255
 	.byte	155
@@ -242,7 +228,7 @@ GCC_except_table2:
 	.uleb128 .Ltmp7-.Lfunc_begin0
 	.byte	1
 	.uleb128 .Ltmp6-.Lfunc_begin0
-	.uleb128 .Lfunc_end2-.Ltmp6
+	.uleb128 .Lfunc_end1-.Ltmp6
 	.byte	0
 	.byte	0
 .Lcst_end0:
@@ -259,14 +245,14 @@ GCC_except_table2:
 core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>:
 	.cfi_startproc
 	testq	%rsi, %rsi
-	je	.LBB3_1
+	je	.LBB2_1
 	shlq	$2, %rsi
 	movl	$4, %edx
 	jmpq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB3_1:
+.LBB2_1:
 	retq
-.Lfunc_end3:
-	.size	core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>, .Lfunc_end3-core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>
+.Lfunc_end2:
+	.size	core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>, .Lfunc_end2-core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>
 	.cfi_endproc
 
 	.section	".text.core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>","ax",@progbits
@@ -275,14 +261,14 @@ core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>:
 core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>:
 	.cfi_startproc
 	testq	%rsi, %rsi
-	je	.LBB4_1
+	je	.LBB3_1
 	shlq	$2, %rsi
 	movl	$4, %edx
 	jmpq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB4_1:
+.LBB3_1:
 	retq
-.Lfunc_end4:
-	.size	core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>, .Lfunc_end4-core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>
+.Lfunc_end3:
+	.size	core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>, .Lfunc_end3-core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>
 	.cfi_endproc
 
 	.section	.text.alloc::raw_vec::finish_grow,"ax",@progbits
@@ -302,41 +288,41 @@ alloc::raw_vec::finish_grow:
 	movq	%rdx, %rbx
 	movq	%rdi, %r14
 	testq	%rsi, %rsi
-	je	.LBB5_6
+	je	.LBB4_6
 	movq	%rsi, %r15
 	cmpq	$0, 8(%rcx)
-	je	.LBB5_7
+	je	.LBB4_7
 	movq	16(%rcx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB5_7
+	je	.LBB4_7
 	movq	(%rcx), %rdi
 	movq	%r15, %rdx
 	movq	%rbx, %rcx
 	callq	*__rust_realloc@GOTPCREL(%rip)
 	testq	%rax, %rax
-	jne	.LBB5_11
-.LBB5_4:
+	jne	.LBB4_11
+.LBB4_4:
 	movq	%r15, 8(%r14)
-	jmp	.LBB5_5
-.LBB5_7:
+	jmp	.LBB4_5
+.LBB4_7:
 	testq	%rbx, %rbx
-	je	.LBB5_8
+	je	.LBB4_8
 	movq	__rust_no_alloc_shim_is_unstable@GOTPCREL(%rip), %rax
 	movzbl	(%rax), %eax
 	movq	%rbx, %rdi
 	movq	%r15, %rsi
 	callq	*__rust_alloc@GOTPCREL(%rip)
 	testq	%rax, %rax
-	je	.LBB5_4
-.LBB5_11:
+	je	.LBB4_4
+.LBB4_11:
 	movq	%rax, 8(%r14)
 	xorl	%eax, %eax
-	jmp	.LBB5_12
-.LBB5_6:
+	jmp	.LBB4_12
+.LBB4_6:
 	movq	$0, 8(%r14)
-.LBB5_5:
+.LBB4_5:
 	movl	$1, %eax
-.LBB5_12:
+.LBB4_12:
 	movq	%rbx, 16(%r14)
 	movq	%rax, (%r14)
 	popq	%rbx
@@ -346,14 +332,14 @@ alloc::raw_vec::finish_grow:
 	popq	%r15
 	.cfi_def_cfa_offset 8
 	retq
-.LBB5_8:
+.LBB4_8:
 	.cfi_def_cfa_offset 32
 	movq	%r15, %rax
 	testq	%rax, %rax
-	jne	.LBB5_11
-	jmp	.LBB5_4
-.Lfunc_end5:
-	.size	alloc::raw_vec::finish_grow, .Lfunc_end5-alloc::raw_vec::finish_grow
+	jne	.LBB4_11
+	jmp	.LBB4_4
+.Lfunc_end4:
+	.size	alloc::raw_vec::finish_grow, .Lfunc_end4-alloc::raw_vec::finish_grow
 	.cfi_endproc
 
 	.section	".text.alloc::raw_vec::RawVec<T,A>::reserve_for_push","ax",@progbits
@@ -370,7 +356,7 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	.cfi_offset %rbx, -24
 	.cfi_offset %r14, -16
 	incq	%rsi
-	je	.LBB6_10
+	je	.LBB5_10
 	movq	%rdi, %rbx
 	movq	8(%rdi), %rax
 	leaq	(%rax,%rax), %rcx
@@ -386,25 +372,25 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	leaq	(,%r14,4), %rdx
 	shlq	$2, %rsi
 	testq	%rax, %rax
-	je	.LBB6_3
+	je	.LBB5_3
 	movq	(%rbx), %rcx
 	shlq	$2, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$4, 16(%rsp)
 	movq	%rax, 24(%rsp)
-	jmp	.LBB6_4
-.LBB6_3:
+	jmp	.LBB5_4
+.LBB5_3:
 	movq	$0, 16(%rsp)
-.LBB6_4:
+.LBB5_4:
 	leaq	32(%rsp), %rdi
 	leaq	8(%rsp), %rcx
 	callq	alloc::raw_vec::finish_grow
 	cmpq	$0, 32(%rsp)
 	movq	40(%rsp), %rdi
-	je	.LBB6_5
+	je	.LBB5_5
 	movabsq	$-9223372036854775807, %rax
 	cmpq	%rax, %rdi
-	jne	.LBB6_8
+	jne	.LBB5_8
 	addq	$56, %rsp
 	.cfi_def_cfa_offset 24
 	popq	%rbx
@@ -412,7 +398,7 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB6_5:
+.LBB5_5:
 	.cfi_def_cfa_offset 80
 	movq	%rdi, (%rbx)
 	movq	%r14, 8(%rbx)
@@ -423,19 +409,19 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB6_8:
+.LBB5_8:
 	.cfi_def_cfa_offset 80
 	testq	%rdi, %rdi
-	jne	.LBB6_9
-.LBB6_10:
+	jne	.LBB5_9
+.LBB5_10:
 	callq	*alloc::raw_vec::capacity_overflow@GOTPCREL(%rip)
 	ud2
-.LBB6_9:
+.LBB5_9:
 	movq	48(%rsp), %rsi
 	callq	*alloc::alloc::handle_alloc_error@GOTPCREL(%rip)
 	ud2
-.Lfunc_end6:
-	.size	alloc::raw_vec::RawVec<T,A>::reserve_for_push, .Lfunc_end6-alloc::raw_vec::RawVec<T,A>::reserve_for_push
+.Lfunc_end5:
+	.size	alloc::raw_vec::RawVec<T,A>::reserve_for_push, .Lfunc_end5-alloc::raw_vec::RawVec<T,A>::reserve_for_push
 	.cfi_endproc
 
 	.section	".text.alloc::raw_vec::RawVec<T,A>::reserve_for_push","ax",@progbits
@@ -452,7 +438,7 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	.cfi_offset %rbx, -24
 	.cfi_offset %r14, -16
 	incq	%rsi
-	je	.LBB7_10
+	je	.LBB6_10
 	movq	%rdi, %rbx
 	movq	8(%rdi), %rax
 	leaq	(%rax,%rax), %rcx
@@ -468,25 +454,25 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	leaq	(,%r14,4), %rdx
 	shlq	$2, %rsi
 	testq	%rax, %rax
-	je	.LBB7_3
+	je	.LBB6_3
 	movq	(%rbx), %rcx
 	shlq	$2, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$4, 16(%rsp)
 	movq	%rax, 24(%rsp)
-	jmp	.LBB7_4
-.LBB7_3:
+	jmp	.LBB6_4
+.LBB6_3:
 	movq	$0, 16(%rsp)
-.LBB7_4:
+.LBB6_4:
 	leaq	32(%rsp), %rdi
 	leaq	8(%rsp), %rcx
 	callq	alloc::raw_vec::finish_grow
 	cmpq	$0, 32(%rsp)
 	movq	40(%rsp), %rdi
-	je	.LBB7_5
+	je	.LBB6_5
 	movabsq	$-9223372036854775807, %rax
 	cmpq	%rax, %rdi
-	jne	.LBB7_8
+	jne	.LBB6_8
 	addq	$56, %rsp
 	.cfi_def_cfa_offset 24
 	popq	%rbx
@@ -494,7 +480,7 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB7_5:
+.LBB6_5:
 	.cfi_def_cfa_offset 80
 	movq	%rdi, (%rbx)
 	movq	%r14, 8(%rbx)
@@ -505,19 +491,19 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB7_8:
+.LBB6_8:
 	.cfi_def_cfa_offset 80
 	testq	%rdi, %rdi
-	jne	.LBB7_9
-.LBB7_10:
+	jne	.LBB6_9
+.LBB6_10:
 	callq	*alloc::raw_vec::capacity_overflow@GOTPCREL(%rip)
 	ud2
-.LBB7_9:
+.LBB6_9:
 	movq	48(%rsp), %rsi
 	callq	*alloc::alloc::handle_alloc_error@GOTPCREL(%rip)
 	ud2
-.Lfunc_end7:
-	.size	alloc::raw_vec::RawVec<T,A>::reserve_for_push, .Lfunc_end7-alloc::raw_vec::RawVec<T,A>::reserve_for_push
+.Lfunc_end6:
+	.size	alloc::raw_vec::RawVec<T,A>::reserve_for_push, .Lfunc_end6-alloc::raw_vec::RawVec<T,A>::reserve_for_push
 	.cfi_endproc
 
 	.section	.text.query_iter,"ax",@progbits
@@ -549,17 +535,18 @@ query_iter:
 	.cfi_offset %r14, -32
 	.cfi_offset %r15, -24
 	.cfi_offset %rbp, -16
-	movq	(%rdi), %rax
-	cmpq	752(%rsi), %rax
-	movq	%rdi, (%rsp)
-	jne	.LBB8_1
+	movq	%rsi, %rax
 	movq	%rdi, %r15
-	movq	%rsi, 88(%rsp)
-	movq	168(%rsi), %r8
-	movq	8(%rdi), %r14
-	movq	%r8, 8(%rdi)
-	cmpq	%r8, %r14
-	jae	.LBB8_48
+	movq	752(%rsi), %rsi
+	movq	(%rdi), %rdi
+	cmpq	%rsi, %rdi
+	jne	.LBB7_5
+	movq	%rax, 88(%rsp)
+	movq	168(%rax), %rsi
+	movq	8(%r15), %r14
+	movq	%rsi, 8(%r15)
+	cmpq	%rsi, %r14
+	jae	.LBB7_47
 	leaq	80(%r15), %rax
 	movq	%rax, 80(%rsp)
 	leaq	104(%r15), %rax
@@ -567,78 +554,79 @@ query_iter:
 	leaq	112(%r15), %rax
 	movq	%rax, 128(%rsp)
 	leaq	136(%r15), %rax
-	movq	%rax, 120(%rsp)
+	movq	%rax, 112(%rsp)
 	leaq	312(%r15), %rax
 	movq	%rax, 168(%rsp)
 	leaq	48(%r15), %rax
 	movq	%rax, 160(%rsp)
 	leaq	72(%r15), %rax
-	movq	%rax, 112(%rsp)
+	movq	%rax, 104(%rsp)
 	leaq	272(%r15), %rax
 	movq	%rax, 144(%rsp)
 	leaq	16(%r15), %rax
 	movq	%rax, 152(%rsp)
 	leaq	40(%r15), %rax
-	movq	%rax, 104(%rsp)
+	movq	%rax, 96(%rsp)
 	leaq	248(%r15), %rax
 	movq	%rax, 136(%rsp)
 	movq	88(%rsp), %rax
-	movq	152(%rax), %r9
-	movq	%r8, 96(%rsp)
-	movq	%r9, 8(%rsp)
-	jmp	.LBB8_6
-.LBB8_45:
-	movq	(%rsp), %r15
+	movq	152(%rax), %r8
+	movq	%r15, 16(%rsp)
+	movq	%rsi, 120(%rsp)
+	movq	%r8, 24(%rsp)
+	jmp	.LBB7_3
+.LBB7_44:
+	movq	16(%rsp), %r15
 	movq	264(%r15), %rsi
-.LBB8_46:
-	movq	96(%rsp), %r8
-	movq	8(%rsp), %r9
+.LBB7_45:
+	movq	24(%rsp), %r8
 	movq	248(%r15), %rax
 	movl	%ebp, (%rax,%rsi,4)
 	incq	%rsi
 	movq	%rsi, 264(%r15)
+	movq	120(%rsp), %rsi
 	.p2align	4, 0x90
-.LBB8_47:
+.LBB7_46:
 	incq	%r14
-	cmpq	%r14, %r8
-	je	.LBB8_48
-.LBB8_6:
+	cmpq	%r14, %rsi
+	je	.LBB7_47
+.LBB7_3:
 	movl	%r14d, %edi
-	cmpq	%r8, %rdi
-	jae	.LBB8_7
+	cmpq	%rsi, %rdi
+	jae	.LBB7_4
 	imulq	$152, %rdi, %rdx
 	movq	296(%r15), %rax
-	movq	136(%r9,%rdx), %rcx
+	movq	136(%r8,%rdx), %rcx
 	cmpq	%rax, %rcx
-	jbe	.LBB8_47
-	movq	128(%r9,%rdx), %rbx
+	jbe	.LBB7_46
+	movq	128(%r8,%rdx), %rbx
 	testq	%rbx, %rbx
-	je	.LBB8_47
+	je	.LBB7_46
 	shlq	$4, %rax
 	cmpq	$0, (%rbx,%rax)
-	je	.LBB8_47
+	je	.LBB7_46
 	movq	304(%r15), %r12
 	cmpq	%r12, %rcx
-	jbe	.LBB8_47
+	jbe	.LBB7_46
 	shlq	$4, %r12
 	cmpq	$0, (%rbx,%r12)
-	je	.LBB8_47
+	je	.LBB7_46
 	movq	%rdx, 72(%rsp)
-	movq	96(%r9,%rdx), %rcx
+	movq	96(%r8,%rdx), %rcx
 	movq	8(%rbx,%rax), %rax
 	shlq	$4, %rax
 	movq	%rcx, 176(%rsp)
 	movq	(%rcx,%rax), %r13
 	leaq	1(%r13), %r15
-.Ltmp10:
+.Ltmp12:
 	movq	80(%rsp), %rdi
 	movq	%r15, %rsi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp11:
-	movq	%r13, 48(%rsp)
+.Ltmp13:
+	movq	%r13, 8(%rsp)
 	movq	64(%rsp), %rax
 	cmpq	%r13, (%rax)
-	jbe	.LBB8_15
+	jbe	.LBB7_14
 	movq	%r15, %rsi
 	movq	%r13, %rbp
 	shrq	$5, %rbp
@@ -648,34 +636,34 @@ query_iter:
 	movq	80(%rsp), %rax
 	movq	(%rax), %rax
 	orl	%r15d, (%rax,%rbp,4)
-.Ltmp12:
+.Ltmp14:
 	movq	128(%rsp), %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp13:
-	movq	%r13, 48(%rsp)
-	movq	120(%rsp), %rax
+.Ltmp15:
+	movq	%r13, 8(%rsp)
+	movq	112(%rsp), %rax
 	cmpq	%r13, (%rax)
-	jbe	.LBB8_20
+	jbe	.LBB7_19
 	movq	128(%rsp), %rax
 	movq	(%rax), %rax
 	orl	%r15d, (%rax,%rbp,4)
 	leaq	(%rbx,%r12), %rax
 	cmpq	$0, (%rax)
 	movq	80(%rsp), %rdx
-	je	.LBB8_25
+	je	.LBB7_24
 	movq	8(%rbx,%r12), %rax
 	shlq	$4, %rax
 	movq	176(%rsp), %rcx
 	movq	(%rcx,%rax), %r13
 	leaq	1(%r13), %rsi
-.Ltmp14:
+.Ltmp16:
 	movq	%rdx, %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp15:
-	movq	%r13, 48(%rsp)
+.Ltmp17:
+	movq	%r13, 8(%rsp)
 	movq	64(%rsp), %rax
 	cmpq	%r13, (%rax)
-	jbe	.LBB8_15
+	jbe	.LBB7_14
 	movl	$1, %eax
 	movl	%r13d, %ecx
 	shll	%cl, %eax
@@ -683,98 +671,98 @@ query_iter:
 	movq	(%rdx), %rcx
 	shrq	$5, %r13
 	orl	%eax, (%rcx,%r13,4)
-.LBB8_25:
-.Ltmp16:
-	movq	8(%rsp), %rax
+.LBB7_24:
+.Ltmp18:
+	movq	24(%rsp), %rax
 	movq	72(%rsp), %rcx
 	leaq	(%rax,%rcx), %rsi
 	movq	168(%rsp), %rdi
 	callq	*<() as bevy_ecs::query::fetch::WorldQuery>::update_archetype_component_access@GOTPCREL(%rip)
-.Ltmp17:
-	movq	8(%rsp), %r9
+.Ltmp19:
+	movq	24(%rsp), %r8
 	movq	72(%rsp), %rcx
-	movl	144(%r9,%rcx), %ebp
+	movl	144(%r8,%rcx), %ebp
 	movq	%rbp, %rbx
 	shrq	$5, %rbx
-	movq	(%rsp), %r15
+	movq	16(%rsp), %r15
 	cmpq	64(%r15), %rbx
-	jae	.LBB8_35
+	jae	.LBB7_34
 	movq	48(%r15), %rax
 	testq	%rax, %rax
-	je	.LBB8_35
+	je	.LBB7_34
 	movl	(%rax,%rbx,4), %eax
 	btl	%ebp, %eax
-	jb	.LBB8_29
-.LBB8_35:
+	jb	.LBB7_28
+.LBB7_34:
 	leaq	1(%rbp), %rsi
-.Ltmp18:
+.Ltmp20:
 	movq	160(%rsp), %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp19:
-	movq	%rbp, 48(%rsp)
-	movq	112(%rsp), %rax
+.Ltmp21:
+	movq	%rbp, 8(%rsp)
+	movq	104(%rsp), %rax
 	cmpq	%rbp, (%rax)
-	jbe	.LBB8_37
+	jbe	.LBB7_36
 	movl	$1, %eax
 	movl	%ebp, %ecx
 	shll	%cl, %eax
-	movq	(%rsp), %r15
+	movq	16(%rsp), %r15
 	movq	48(%r15), %rcx
 	orl	%eax, (%rcx,%rbx,4)
 	movq	288(%r15), %rsi
 	cmpq	280(%r15), %rsi
-	jne	.LBB8_42
-.Ltmp20:
+	jne	.LBB7_41
+.Ltmp22:
 	movq	144(%rsp), %rdi
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
-.Ltmp21:
-	movq	(%rsp), %r15
+.Ltmp23:
+	movq	16(%rsp), %r15
 	movq	288(%r15), %rsi
-.LBB8_42:
-	movq	8(%rsp), %r9
+.LBB7_41:
+	movq	24(%rsp), %r8
 	movq	72(%rsp), %rcx
 	movq	272(%r15), %rax
 	movl	%ebp, (%rax,%rsi,4)
 	incq	%rsi
 	movq	%rsi, 288(%r15)
-.LBB8_29:
-	movl	148(%r9,%rcx), %ebp
+.LBB7_28:
+	movl	148(%r8,%rcx), %ebp
 	movq	%rbp, %rbx
 	shrq	$5, %rbx
 	cmpq	32(%r15), %rbx
-	movq	96(%rsp), %r8
-	jae	.LBB8_32
+	movq	120(%rsp), %rsi
+	jae	.LBB7_31
 	movq	16(%r15), %rax
 	testq	%rax, %rax
-	je	.LBB8_32
+	je	.LBB7_31
 	movl	(%rax,%rbx,4), %eax
 	btl	%ebp, %eax
-	jb	.LBB8_47
-.LBB8_32:
+	jb	.LBB7_46
+.LBB7_31:
 	leaq	1(%rbp), %rsi
-.Ltmp22:
+.Ltmp24:
 	movq	152(%rsp), %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp23:
-	movq	%rbp, 48(%rsp)
-	movq	104(%rsp), %rax
+.Ltmp25:
+	movq	%rbp, 8(%rsp)
+	movq	96(%rsp), %rax
 	cmpq	%rbp, (%rax)
-	jbe	.LBB8_34
+	jbe	.LBB7_33
 	movl	$1, %eax
 	movl	%ebp, %ecx
 	shll	%cl, %eax
-	movq	(%rsp), %r15
+	movq	16(%rsp), %r15
 	movq	16(%r15), %rcx
 	orl	%eax, (%rcx,%rbx,4)
 	movq	264(%r15), %rsi
 	cmpq	256(%r15), %rsi
-	jne	.LBB8_46
-.Ltmp27:
+	jne	.LBB7_45
+.Ltmp29:
 	movq	136(%rsp), %rdi
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
-.Ltmp28:
-	jmp	.LBB8_45
-.LBB8_48:
+.Ltmp30:
+	jmp	.LBB7_44
+.LBB7_47:
 	movq	88(%rsp), %rax
 	movl	760(%rax), %ecx
 	movq	248(%r15), %rsi
@@ -786,17 +774,17 @@ query_iter:
 	xorl	%r9d, %r9d
 	xorl	%r14d, %r14d
 	cmpq	%r9, %r14
-	jne	.LBB8_58
-.LBB8_50:
+	jne	.LBB7_57
+.LBB7_49:
 	movq	88(%rsp), %rax
 	movq	288(%rax), %r10
 	movq	304(%rax), %r11
 	movq	296(%r15), %rdx
 	movq	304(%r15), %rax
 	.p2align	4, 0x90
-.LBB8_51:
+.LBB7_50:
 	cmpq	%rdi, %rsi
-	je	.LBB8_61
+	je	.LBB7_60
 	movl	(%rsi), %r9d
 	addq	$4, %rsi
 	cmpq	%r9, %r11
@@ -805,7 +793,7 @@ query_iter:
 	cmovbeq	%r8, %rbx
 	movq	64(%rbx), %r9
 	testq	%r9, %r9
-	je	.LBB8_51
+	je	.LBB7_50
 	movq	32(%rbx), %r14
 	shlq	$4, %rdx
 	movq	(%rbx), %rbx
@@ -820,12 +808,12 @@ query_iter:
 	shlq	$5, %rax
 	movq	16(%rbx,%rax), %rbx
 	xorl	%r14d, %r14d
-	jmp	.LBB8_59
+	jmp	.LBB7_58
 	.p2align	4, 0x90
-.LBB8_58:
+.LBB7_57:
 	testq	%r10, %r10
-	je	.LBB8_61
-.LBB8_59:
+	je	.LBB7_60
+.LBB7_58:
 	movl	%r14d, %eax
 	shlq	$2, %rax
 	incq	%r14
@@ -834,9 +822,9 @@ query_iter:
 	addss	(%r10,%rax), %xmm0
 	movss	%xmm0, (%r10,%rax)
 	cmpq	%r9, %r14
-	jne	.LBB8_58
-	jmp	.LBB8_50
-.LBB8_61:
+	jne	.LBB7_57
+	jmp	.LBB7_49
+.LBB7_60:
 	movq	%r15, %rdi
 	addq	$232, %rsp
 	.cfi_def_cfa_offset 56
@@ -853,108 +841,97 @@ query_iter:
 	popq	%rbp
 	.cfi_def_cfa_offset 8
 	jmp	core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_iter::A,&query_state_iter::B)>>
-.LBB8_7:
+.LBB7_4:
 	.cfi_def_cfa_offset 288
-.Ltmp8:
-	leaq	.Lanon.a01df851b6197f632189e2f0fa818bdd.14(%rip), %rdx
-	movq	%r8, %rsi
+.Ltmp10:
+	leaq	.Lanon.a01df851b6197f632189e2f0fa818bdd.9(%rip), %rdx
 	callq	*core::panicking::panic_bounds_check@GOTPCREL(%rip)
-.Ltmp9:
-	jmp	.LBB8_3
-.LBB8_15:
-	leaq	48(%rsp), %rax
-	movq	%rax, 16(%rsp)
+.Ltmp11:
+	jmp	.LBB7_6
+.LBB7_14:
+	leaq	8(%rsp), %rax
+	movq	%rax, 32(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
-	movq	%rax, 24(%rsp)
+	movq	%rax, 40(%rsp)
 	movq	64(%rsp), %rcx
-	jmp	.LBB8_16
-.LBB8_20:
-	leaq	48(%rsp), %rax
-	movq	%rax, 16(%rsp)
+	jmp	.LBB7_15
+.LBB7_19:
+	leaq	8(%rsp), %rax
+	movq	%rax, 32(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
-	movq	%rax, 24(%rsp)
-	movq	120(%rsp), %rcx
-.LBB8_16:
-	movq	%rcx, 32(%rsp)
 	movq	%rax, 40(%rsp)
+	movq	112(%rsp), %rcx
+.LBB7_15:
+	movq	%rcx, 48(%rsp)
+	movq	%rax, 56(%rsp)
 	leaq	.Lanon.a01df851b6197f632189e2f0fa818bdd.6(%rip), %rax
 	movq	%rax, 184(%rsp)
 	leaq	.Lanon.a01df851b6197f632189e2f0fa818bdd.7(%rip), %rsi
-	jmp	.LBB8_17
-.LBB8_37:
-	leaq	48(%rsp), %rax
-	movq	%rax, 16(%rsp)
+	jmp	.LBB7_16
+.LBB7_36:
+	leaq	8(%rsp), %rax
+	movq	%rax, 32(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
-	movq	%rax, 24(%rsp)
-	movq	112(%rsp), %rcx
-	jmp	.LBB8_38
-.LBB8_34:
-	leaq	48(%rsp), %rax
-	movq	%rax, 16(%rsp)
-	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
-	movq	%rax, 24(%rsp)
+	movq	%rax, 40(%rsp)
 	movq	104(%rsp), %rcx
-.LBB8_38:
-	movq	%rcx, 32(%rsp)
+	jmp	.LBB7_37
+.LBB7_33:
+	leaq	8(%rsp), %rax
+	movq	%rax, 32(%rsp)
+	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
 	movq	%rax, 40(%rsp)
+	movq	96(%rsp), %rcx
+.LBB7_37:
+	movq	%rcx, 48(%rsp)
+	movq	%rax, 56(%rsp)
 	leaq	.Lanon.a01df851b6197f632189e2f0fa818bdd.2(%rip), %rax
 	movq	%rax, 184(%rsp)
 	leaq	.Lanon.a01df851b6197f632189e2f0fa818bdd.4(%rip), %rsi
-.LBB8_17:
-	movl	$2, %eax
-	leaq	16(%rsp), %rcx
-.LBB8_2:
+.LBB7_16:
+	leaq	32(%rsp), %rax
 	leaq	184(%rsp), %rdi
 	movq	$2, 8(%rdi)
 	movq	$0, 32(%rdi)
-	movq	%rcx, 16(%rdi)
-	movq	%rax, 24(%rdi)
-.Ltmp24:
-	movq	(%rsp), %r15
+	movq	%rax, 16(%rdi)
+	movq	$2, 24(%rdi)
+.Ltmp26:
+	movq	16(%rsp), %r15
 	callq	*core::panicking::panic_fmt@GOTPCREL(%rip)
-.Ltmp25:
-.LBB8_3:
+.Ltmp27:
+	jmp	.LBB7_6
+.LBB7_5:
+.Ltmp8:
+	leaq	.Lanon.a01df851b6197f632189e2f0fa818bdd.10(%rip), %rdx
+	callq	*bevy_ecs::query::state::QueryState<Q,F>::validate_world::panic_mismatched@GOTPCREL(%rip)
+.Ltmp9:
+.LBB7_6:
 	ud2
-.LBB8_1:
-	leaq	.Lanon.a01df851b6197f632189e2f0fa818bdd.11(%rip), %rax
-	movq	%rax, 16(%rsp)
-	movq	$84, 24(%rsp)
-	leaq	16(%rsp), %rax
-	movq	%rax, 48(%rsp)
-	leaq	<&T as core::fmt::Display>::fmt(%rip), %rax
-	movq	%rax, 56(%rsp)
-	leaq	.Lanon.a01df851b6197f632189e2f0fa818bdd.10(%rip), %rax
-	movq	%rax, 184(%rsp)
-	leaq	.Lanon.a01df851b6197f632189e2f0fa818bdd.13(%rip), %rsi
-	movl	$1, %eax
-	leaq	48(%rsp), %rcx
-	jmp	.LBB8_2
-.LBB8_54:
-.Ltmp29:
+.LBB7_53:
+.Ltmp31:
 	movq	%rax, %r14
-	movq	(%rsp), %r15
-	jmp	.LBB8_56
-.LBB8_55:
-.Ltmp26:
+	movq	16(%rsp), %r15
+	jmp	.LBB7_55
+.LBB7_54:
+.Ltmp28:
 	movq	%rax, %r14
-.LBB8_56:
-.Ltmp30:
+.LBB7_55:
+.Ltmp32:
 	movq	%r15, %rdi
 	callq	core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_iter::A,&query_state_iter::B)>>
-.Ltmp31:
+.Ltmp33:
 	movq	%r14, %rdi
 	callq	_Unwind_Resume@PLT
 	ud2
-.LBB8_60:
-.Ltmp32:
+.LBB7_59:
+.Ltmp34:
 	callq	*core::panicking::panic_cannot_unwind@GOTPCREL(%rip)
 	ud2
-.Lfunc_end8:
-	.size	query_iter, .Lfunc_end8-query_iter
+.Lfunc_end7:
+	.size	query_iter, .Lfunc_end7-query_iter
 	.cfi_endproc
 	.section	.gcc_except_table.query_iter,"a",@progbits
 	.p2align	2, 0x0
-GCC_except_table8:
+GCC_except_table7:
 .Lexception1:
 	.byte	255
 	.byte	155
@@ -963,24 +940,24 @@ GCC_except_table8:
 	.byte	1
 	.uleb128 .Lcst_end1-.Lcst_begin1
 .Lcst_begin1:
-	.uleb128 .Ltmp10-.Lfunc_begin1
-	.uleb128 .Ltmp28-.Ltmp10
-	.uleb128 .Ltmp29-.Lfunc_begin1
+	.uleb128 .Ltmp12-.Lfunc_begin1
+	.uleb128 .Ltmp30-.Ltmp12
+	.uleb128 .Ltmp31-.Lfunc_begin1
 	.byte	0
-	.uleb128 .Ltmp28-.Lfunc_begin1
-	.uleb128 .Ltmp8-.Ltmp28
+	.uleb128 .Ltmp30-.Lfunc_begin1
+	.uleb128 .Ltmp10-.Ltmp30
 	.byte	0
 	.byte	0
-	.uleb128 .Ltmp8-.Lfunc_begin1
-	.uleb128 .Ltmp25-.Ltmp8
-	.uleb128 .Ltmp26-.Lfunc_begin1
+	.uleb128 .Ltmp10-.Lfunc_begin1
+	.uleb128 .Ltmp9-.Ltmp10
+	.uleb128 .Ltmp28-.Lfunc_begin1
 	.byte	0
-	.uleb128 .Ltmp30-.Lfunc_begin1
-	.uleb128 .Ltmp31-.Ltmp30
 	.uleb128 .Ltmp32-.Lfunc_begin1
+	.uleb128 .Ltmp33-.Ltmp32
+	.uleb128 .Ltmp34-.Lfunc_begin1
 	.byte	1
-	.uleb128 .Ltmp31-.Lfunc_begin1
-	.uleb128 .Lfunc_end8-.Ltmp31
+	.uleb128 .Ltmp33-.Lfunc_begin1
+	.uleb128 .Lfunc_end7-.Ltmp33
 	.byte	0
 	.byte	0
 .Lcst_end1:
@@ -1054,52 +1031,24 @@ GCC_except_table8:
 	.type	.Lanon.a01df851b6197f632189e2f0fa818bdd.8,@object
 	.section	.rodata..Lanon.a01df851b6197f632189e2f0fa818bdd.8,"a",@progbits
 .Lanon.a01df851b6197f632189e2f0fa818bdd.8:
-	.ascii	"Attempted to use "
-	.size	.Lanon.a01df851b6197f632189e2f0fa818bdd.8, 17
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-41530a2346942c86/c9f9133/crates/bevy_ecs/src/query/state.rs"
+	.size	.Lanon.a01df851b6197f632189e2f0fa818bdd.8, 97
 
 	.type	.Lanon.a01df851b6197f632189e2f0fa818bdd.9,@object
-	.section	.rodata..Lanon.a01df851b6197f632189e2f0fa818bdd.9,"a",@progbits
+	.section	.data.rel.ro..Lanon.a01df851b6197f632189e2f0fa818bdd.9,"aw",@progbits
+	.p2align	3, 0x0
 .Lanon.a01df851b6197f632189e2f0fa818bdd.9:
-	.ascii	" with a mismatched World. QueryStates can only be used with the World they were created from."
-	.size	.Lanon.a01df851b6197f632189e2f0fa818bdd.9, 93
+	.quad	.Lanon.a01df851b6197f632189e2f0fa818bdd.8
+	.asciz	"a\000\000\000\000\000\000\000\330\000\000\000!\000\000"
+	.size	.Lanon.a01df851b6197f632189e2f0fa818bdd.9, 24
 
 	.type	.Lanon.a01df851b6197f632189e2f0fa818bdd.10,@object
 	.section	.data.rel.ro..Lanon.a01df851b6197f632189e2f0fa818bdd.10,"aw",@progbits
 	.p2align	3, 0x0
 .Lanon.a01df851b6197f632189e2f0fa818bdd.10:
 	.quad	.Lanon.a01df851b6197f632189e2f0fa818bdd.8
-	.asciz	"\021\000\000\000\000\000\000"
-	.quad	.Lanon.a01df851b6197f632189e2f0fa818bdd.9
-	.asciz	"]\000\000\000\000\000\000"
-	.size	.Lanon.a01df851b6197f632189e2f0fa818bdd.10, 32
-
-	.type	.Lanon.a01df851b6197f632189e2f0fa818bdd.11,@object
-	.section	.rodata..Lanon.a01df851b6197f632189e2f0fa818bdd.11,"a",@progbits
-.Lanon.a01df851b6197f632189e2f0fa818bdd.11:
-	.ascii	"bevy_ecs::query::state::QueryState<(&mut query_state_iter::A, &query_state_iter::B)>"
-	.size	.Lanon.a01df851b6197f632189e2f0fa818bdd.11, 84
-
-	.type	.Lanon.a01df851b6197f632189e2f0fa818bdd.12,@object
-	.section	.rodata..Lanon.a01df851b6197f632189e2f0fa818bdd.12,"a",@progbits
-.Lanon.a01df851b6197f632189e2f0fa818bdd.12:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/0607116/crates/bevy_ecs/src/query/state.rs"
-	.size	.Lanon.a01df851b6197f632189e2f0fa818bdd.12, 97
-
-	.type	.Lanon.a01df851b6197f632189e2f0fa818bdd.13,@object
-	.section	.data.rel.ro..Lanon.a01df851b6197f632189e2f0fa818bdd.13,"aw",@progbits
-	.p2align	3, 0x0
-.Lanon.a01df851b6197f632189e2f0fa818bdd.13:
-	.quad	.Lanon.a01df851b6197f632189e2f0fa818bdd.12
-	.asciz	"a\000\000\000\000\000\000\000\344\000\000\000\t\000\000"
-	.size	.Lanon.a01df851b6197f632189e2f0fa818bdd.13, 24
-
-	.type	.Lanon.a01df851b6197f632189e2f0fa818bdd.14,@object
-	.section	.data.rel.ro..Lanon.a01df851b6197f632189e2f0fa818bdd.14,"aw",@progbits
-	.p2align	3, 0x0
-.Lanon.a01df851b6197f632189e2f0fa818bdd.14:
-	.quad	.Lanon.a01df851b6197f632189e2f0fa818bdd.12
-	.asciz	"a\000\000\000\000\000\000\000\330\000\000\000!\000\000"
-	.size	.Lanon.a01df851b6197f632189e2f0fa818bdd.14, 24
+	.asciz	"a\000\000\000\000\000\000\000\321\000\000\000\016\000\000"
+	.size	.Lanon.a01df851b6197f632189e2f0fa818bdd.10, 24
 
 	.hidden	DW.ref.rust_eh_personality
 	.weak	DW.ref.rust_eh_personality
diff --git a/results/query_state_iter_sparse.s b/results/query_state_iter_sparse.s
index 98bbb53..6c603b5 100644
--- a/results/query_state_iter_sparse.s
+++ b/results/query_state_iter_sparse.s
@@ -1,19 +1,5 @@
 	.text
-	.file	"query_state_iter_sparse.e3bb7334da839560-cgu.0"
-	.section	".text.<&T as core::fmt::Display>::fmt","ax",@progbits
-	.p2align	4, 0x90
-	.type	<&T as core::fmt::Display>::fmt,@function
-<&T as core::fmt::Display>::fmt:
-	.cfi_startproc
-	movq	%rsi, %rdx
-	movq	(%rdi), %rax
-	movq	8(%rdi), %rsi
-	movq	%rax, %rdi
-	jmpq	*<str as core::fmt::Display>::fmt@GOTPCREL(%rip)
-.Lfunc_end0:
-	.size	<&T as core::fmt::Display>::fmt, .Lfunc_end0-<&T as core::fmt::Display>::fmt
-	.cfi_endproc
-
+	.file	"query_state_iter_sparse.e117d690c5d77dba-cgu.0"
 	.section	".text.core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>","ax",@progbits
 	.p2align	4, 0x90
 	.type	core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>,@function
@@ -37,53 +23,53 @@ core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::compo
 	movq	%rdi, %rbx
 	movq	32(%rdi), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_2
+	je	.LBB0_2
 	movq	24(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB1_2:
+.LBB0_2:
 	movq	64(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_4
+	je	.LBB0_4
 	movq	56(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB1_4:
+.LBB0_4:
 	movq	(%rbx), %r14
 	movq	16(%rbx), %r15
 	testq	%r15, %r15
-	je	.LBB1_11
+	je	.LBB0_11
 	leaq	40(%r14), %r12
 	movq	__rust_dealloc@GOTPCREL(%rip), %r13
-	jmp	.LBB1_6
+	jmp	.LBB0_6
 	.p2align	4, 0x90
-.LBB1_10:
+.LBB0_10:
 	addq	$64, %r12
 	decq	%r15
-	je	.LBB1_11
-.LBB1_6:
+	je	.LBB0_11
+.LBB0_6:
 	movq	-32(%r12), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_8
+	je	.LBB0_8
 	movq	-40(%r12), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*%r13
-.LBB1_8:
+.LBB0_8:
 	movq	(%r12), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_10
+	je	.LBB0_10
 	movq	-8(%r12), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*%r13
-	jmp	.LBB1_10
-.LBB1_11:
+	jmp	.LBB0_10
+.LBB0_11:
 	movq	8(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB1_12
+	je	.LBB0_12
 	shlq	$6, %rsi
 	movl	$8, %edx
 	movq	%r14, %rdi
@@ -98,7 +84,7 @@ core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::compo
 	popq	%r15
 	.cfi_def_cfa_offset 8
 	jmpq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB1_12:
+.LBB0_12:
 	.cfi_def_cfa_offset 48
 	popq	%rbx
 	.cfi_def_cfa_offset 40
@@ -111,8 +97,8 @@ core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::compo
 	popq	%r15
 	.cfi_def_cfa_offset 8
 	retq
-.Lfunc_end1:
-	.size	core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>, .Lfunc_end1-core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>
+.Lfunc_end0:
+	.size	core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>, .Lfunc_end0-core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>
 	.cfi_endproc
 
 	.section	".text.core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_iter_sparse::A,&query_state_iter_sparse::B)>>","ax",@progbits
@@ -134,51 +120,51 @@ core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_it
 	movq	%rdi, %rbx
 	movq	24(%rdi), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_2
+	je	.LBB1_2
 	movq	16(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_2:
+.LBB1_2:
 	movq	56(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_4
+	je	.LBB1_4
 	movq	48(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_4:
+.LBB1_4:
 	movq	88(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_6
+	je	.LBB1_6
 	movq	80(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_6:
+.LBB1_6:
 	movq	120(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_8
+	je	.LBB1_8
 	movq	112(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_8:
+.LBB1_8:
 	leaq	152(%rbx), %rdi
 .Ltmp0:
 	callq	core::ptr::drop_in_place<bevy_ecs::query::access::FilteredAccess<bevy_ecs::component::ComponentId>>
 .Ltmp1:
 	movq	256(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_11
+	je	.LBB1_11
 	movq	248(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
 	callq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_11:
+.LBB1_11:
 	movq	280(%rbx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB2_16
+	je	.LBB1_16
 	movq	272(%rbx), %rdi
 	shlq	$2, %rsi
 	movl	$4, %edx
@@ -189,7 +175,7 @@ core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_it
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	jmpq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB2_16:
+.LBB1_16:
 	.cfi_def_cfa_offset 32
 	addq	$8, %rsp
 	.cfi_def_cfa_offset 24
@@ -198,7 +184,7 @@ core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_it
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB2_13:
+.LBB1_13:
 	.cfi_def_cfa_offset 32
 .Ltmp2:
 	movq	%rax, %r14
@@ -215,16 +201,16 @@ core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_it
 	movq	%r14, %rdi
 	callq	_Unwind_Resume@PLT
 	ud2
-.LBB2_17:
+.LBB1_17:
 .Ltmp7:
 	callq	*core::panicking::panic_cannot_unwind@GOTPCREL(%rip)
 	ud2
-.Lfunc_end2:
-	.size	core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_iter_sparse::A,&query_state_iter_sparse::B)>>, .Lfunc_end2-core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_iter_sparse::A,&query_state_iter_sparse::B)>>
+.Lfunc_end1:
+	.size	core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_iter_sparse::A,&query_state_iter_sparse::B)>>, .Lfunc_end1-core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_iter_sparse::A,&query_state_iter_sparse::B)>>
 	.cfi_endproc
 	.section	".gcc_except_table.core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_iter_sparse::A,&query_state_iter_sparse::B)>>","a",@progbits
 	.p2align	2, 0x0
-GCC_except_table2:
+GCC_except_table1:
 .Lexception0:
 	.byte	255
 	.byte	155
@@ -242,7 +228,7 @@ GCC_except_table2:
 	.uleb128 .Ltmp7-.Lfunc_begin0
 	.byte	1
 	.uleb128 .Ltmp6-.Lfunc_begin0
-	.uleb128 .Lfunc_end2-.Ltmp6
+	.uleb128 .Lfunc_end1-.Ltmp6
 	.byte	0
 	.byte	0
 .Lcst_end0:
@@ -259,14 +245,14 @@ GCC_except_table2:
 core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>:
 	.cfi_startproc
 	testq	%rsi, %rsi
-	je	.LBB3_1
+	je	.LBB2_1
 	shlq	$2, %rsi
 	movl	$4, %edx
 	jmpq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB3_1:
+.LBB2_1:
 	retq
-.Lfunc_end3:
-	.size	core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>, .Lfunc_end3-core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>
+.Lfunc_end2:
+	.size	core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>, .Lfunc_end2-core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>
 	.cfi_endproc
 
 	.section	".text.core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>","ax",@progbits
@@ -275,14 +261,14 @@ core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::archetype::ArchetypeId>>:
 core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>:
 	.cfi_startproc
 	testq	%rsi, %rsi
-	je	.LBB4_1
+	je	.LBB3_1
 	shlq	$2, %rsi
 	movl	$4, %edx
 	jmpq	*__rust_dealloc@GOTPCREL(%rip)
-.LBB4_1:
+.LBB3_1:
 	retq
-.Lfunc_end4:
-	.size	core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>, .Lfunc_end4-core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>
+.Lfunc_end3:
+	.size	core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>, .Lfunc_end3-core::ptr::drop_in_place<alloc::vec::Vec<bevy_ecs::storage::table::TableId>>
 	.cfi_endproc
 
 	.section	.text.alloc::raw_vec::finish_grow,"ax",@progbits
@@ -302,41 +288,41 @@ alloc::raw_vec::finish_grow:
 	movq	%rdx, %rbx
 	movq	%rdi, %r14
 	testq	%rsi, %rsi
-	je	.LBB5_6
+	je	.LBB4_6
 	movq	%rsi, %r15
 	cmpq	$0, 8(%rcx)
-	je	.LBB5_7
+	je	.LBB4_7
 	movq	16(%rcx), %rsi
 	testq	%rsi, %rsi
-	je	.LBB5_7
+	je	.LBB4_7
 	movq	(%rcx), %rdi
 	movq	%r15, %rdx
 	movq	%rbx, %rcx
 	callq	*__rust_realloc@GOTPCREL(%rip)
 	testq	%rax, %rax
-	jne	.LBB5_11
-.LBB5_4:
+	jne	.LBB4_11
+.LBB4_4:
 	movq	%r15, 8(%r14)
-	jmp	.LBB5_5
-.LBB5_7:
+	jmp	.LBB4_5
+.LBB4_7:
 	testq	%rbx, %rbx
-	je	.LBB5_8
+	je	.LBB4_8
 	movq	__rust_no_alloc_shim_is_unstable@GOTPCREL(%rip), %rax
 	movzbl	(%rax), %eax
 	movq	%rbx, %rdi
 	movq	%r15, %rsi
 	callq	*__rust_alloc@GOTPCREL(%rip)
 	testq	%rax, %rax
-	je	.LBB5_4
-.LBB5_11:
+	je	.LBB4_4
+.LBB4_11:
 	movq	%rax, 8(%r14)
 	xorl	%eax, %eax
-	jmp	.LBB5_12
-.LBB5_6:
+	jmp	.LBB4_12
+.LBB4_6:
 	movq	$0, 8(%r14)
-.LBB5_5:
+.LBB4_5:
 	movl	$1, %eax
-.LBB5_12:
+.LBB4_12:
 	movq	%rbx, 16(%r14)
 	movq	%rax, (%r14)
 	popq	%rbx
@@ -346,14 +332,14 @@ alloc::raw_vec::finish_grow:
 	popq	%r15
 	.cfi_def_cfa_offset 8
 	retq
-.LBB5_8:
+.LBB4_8:
 	.cfi_def_cfa_offset 32
 	movq	%r15, %rax
 	testq	%rax, %rax
-	jne	.LBB5_11
-	jmp	.LBB5_4
-.Lfunc_end5:
-	.size	alloc::raw_vec::finish_grow, .Lfunc_end5-alloc::raw_vec::finish_grow
+	jne	.LBB4_11
+	jmp	.LBB4_4
+.Lfunc_end4:
+	.size	alloc::raw_vec::finish_grow, .Lfunc_end4-alloc::raw_vec::finish_grow
 	.cfi_endproc
 
 	.section	".text.alloc::raw_vec::RawVec<T,A>::reserve_for_push","ax",@progbits
@@ -370,7 +356,7 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	.cfi_offset %rbx, -24
 	.cfi_offset %r14, -16
 	incq	%rsi
-	je	.LBB6_10
+	je	.LBB5_10
 	movq	%rdi, %rbx
 	movq	8(%rdi), %rax
 	leaq	(%rax,%rax), %rcx
@@ -386,25 +372,25 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	leaq	(,%r14,4), %rdx
 	shlq	$2, %rsi
 	testq	%rax, %rax
-	je	.LBB6_3
+	je	.LBB5_3
 	movq	(%rbx), %rcx
 	shlq	$2, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$4, 16(%rsp)
 	movq	%rax, 24(%rsp)
-	jmp	.LBB6_4
-.LBB6_3:
+	jmp	.LBB5_4
+.LBB5_3:
 	movq	$0, 16(%rsp)
-.LBB6_4:
+.LBB5_4:
 	leaq	32(%rsp), %rdi
 	leaq	8(%rsp), %rcx
 	callq	alloc::raw_vec::finish_grow
 	cmpq	$0, 32(%rsp)
 	movq	40(%rsp), %rdi
-	je	.LBB6_5
+	je	.LBB5_5
 	movabsq	$-9223372036854775807, %rax
 	cmpq	%rax, %rdi
-	jne	.LBB6_8
+	jne	.LBB5_8
 	addq	$56, %rsp
 	.cfi_def_cfa_offset 24
 	popq	%rbx
@@ -412,7 +398,7 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB6_5:
+.LBB5_5:
 	.cfi_def_cfa_offset 80
 	movq	%rdi, (%rbx)
 	movq	%r14, 8(%rbx)
@@ -423,19 +409,19 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB6_8:
+.LBB5_8:
 	.cfi_def_cfa_offset 80
 	testq	%rdi, %rdi
-	jne	.LBB6_9
-.LBB6_10:
+	jne	.LBB5_9
+.LBB5_10:
 	callq	*alloc::raw_vec::capacity_overflow@GOTPCREL(%rip)
 	ud2
-.LBB6_9:
+.LBB5_9:
 	movq	48(%rsp), %rsi
 	callq	*alloc::alloc::handle_alloc_error@GOTPCREL(%rip)
 	ud2
-.Lfunc_end6:
-	.size	alloc::raw_vec::RawVec<T,A>::reserve_for_push, .Lfunc_end6-alloc::raw_vec::RawVec<T,A>::reserve_for_push
+.Lfunc_end5:
+	.size	alloc::raw_vec::RawVec<T,A>::reserve_for_push, .Lfunc_end5-alloc::raw_vec::RawVec<T,A>::reserve_for_push
 	.cfi_endproc
 
 	.section	".text.alloc::raw_vec::RawVec<T,A>::reserve_for_push","ax",@progbits
@@ -452,7 +438,7 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	.cfi_offset %rbx, -24
 	.cfi_offset %r14, -16
 	incq	%rsi
-	je	.LBB7_10
+	je	.LBB6_10
 	movq	%rdi, %rbx
 	movq	8(%rdi), %rax
 	leaq	(%rax,%rax), %rcx
@@ -468,25 +454,25 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	leaq	(,%r14,4), %rdx
 	shlq	$2, %rsi
 	testq	%rax, %rax
-	je	.LBB7_3
+	je	.LBB6_3
 	movq	(%rbx), %rcx
 	shlq	$2, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$4, 16(%rsp)
 	movq	%rax, 24(%rsp)
-	jmp	.LBB7_4
-.LBB7_3:
+	jmp	.LBB6_4
+.LBB6_3:
 	movq	$0, 16(%rsp)
-.LBB7_4:
+.LBB6_4:
 	leaq	32(%rsp), %rdi
 	leaq	8(%rsp), %rcx
 	callq	alloc::raw_vec::finish_grow
 	cmpq	$0, 32(%rsp)
 	movq	40(%rsp), %rdi
-	je	.LBB7_5
+	je	.LBB6_5
 	movabsq	$-9223372036854775807, %rax
 	cmpq	%rax, %rdi
-	jne	.LBB7_8
+	jne	.LBB6_8
 	addq	$56, %rsp
 	.cfi_def_cfa_offset 24
 	popq	%rbx
@@ -494,7 +480,7 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB7_5:
+.LBB6_5:
 	.cfi_def_cfa_offset 80
 	movq	%rdi, (%rbx)
 	movq	%r14, 8(%rbx)
@@ -505,19 +491,19 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	popq	%r14
 	.cfi_def_cfa_offset 8
 	retq
-.LBB7_8:
+.LBB6_8:
 	.cfi_def_cfa_offset 80
 	testq	%rdi, %rdi
-	jne	.LBB7_9
-.LBB7_10:
+	jne	.LBB6_9
+.LBB6_10:
 	callq	*alloc::raw_vec::capacity_overflow@GOTPCREL(%rip)
 	ud2
-.LBB7_9:
+.LBB6_9:
 	movq	48(%rsp), %rsi
 	callq	*alloc::alloc::handle_alloc_error@GOTPCREL(%rip)
 	ud2
-.Lfunc_end7:
-	.size	alloc::raw_vec::RawVec<T,A>::reserve_for_push, .Lfunc_end7-alloc::raw_vec::RawVec<T,A>::reserve_for_push
+.Lfunc_end6:
+	.size	alloc::raw_vec::RawVec<T,A>::reserve_for_push, .Lfunc_end6-alloc::raw_vec::RawVec<T,A>::reserve_for_push
 	.cfi_endproc
 
 	.section	.text.query_iter,"ax",@progbits
@@ -549,18 +535,20 @@ query_iter:
 	.cfi_offset %r14, -32
 	.cfi_offset %r15, -24
 	.cfi_offset %rbp, -16
-	movq	(%rdi), %rax
-	cmpq	752(%rsi), %rax
-	movq	%rdi, (%rsp)
-	jne	.LBB8_75
+	movq	%rsi, %rax
 	movq	%rdi, %r13
-	movq	%rsi, 64(%rsp)
-	movq	168(%rsi), %rsi
-	movq	8(%rdi), %r15
-	movq	%rsi, 8(%rdi)
+	movq	752(%rsi), %rsi
+	movq	(%rdi), %rdi
+	cmpq	%rsi, %rdi
+	jne	.LBB7_73
+	movq	%rax, 64(%rsp)
+	movq	168(%rax), %rsi
+	movq	8(%r13), %r15
+	movq	%rsi, 8(%r13)
 	cmpq	%rsi, %r15
+	movq	%r13, 16(%rsp)
 	movq	%rsi, 128(%rsp)
-	jae	.LBB8_37
+	jae	.LBB7_37
 	leaq	80(%r13), %rcx
 	leaq	104(%r13), %rax
 	movq	%rax, 72(%rsp)
@@ -584,47 +572,47 @@ query_iter:
 	movq	%rax, 136(%rsp)
 	movq	64(%rsp), %rax
 	movq	152(%rax), %rax
-	movq	%rax, 8(%rsp)
+	movq	%rax, 24(%rsp)
 	movq	%rcx, 80(%rsp)
-	jmp	.LBB8_6
-.LBB8_3:
-	movq	(%rsp), %r13
+	jmp	.LBB7_6
+.LBB7_3:
+	movq	16(%rsp), %r13
 	movq	264(%r13), %rsi
-.LBB8_4:
+.LBB7_4:
 	movq	248(%r13), %rax
 	movl	%ebp, (%rax,%rsi,4)
 	incq	%rsi
 	movq	%rsi, 264(%r13)
 	.p2align	4, 0x90
-.LBB8_5:
+.LBB7_5:
 	incq	%r15
 	movq	128(%rsp), %rsi
 	cmpq	%r15, %rsi
-	je	.LBB8_37
-.LBB8_6:
+	je	.LBB7_37
+.LBB7_6:
 	movl	%r15d, %edi
 	cmpq	%rsi, %rdi
-	jae	.LBB8_65
+	jae	.LBB7_65
 	imulq	$152, %rdi, %rsi
 	movq	296(%r13), %rax
-	movq	8(%rsp), %rcx
+	movq	24(%rsp), %rcx
 	movq	136(%rcx,%rsi), %rcx
 	cmpq	%rax, %rcx
-	jbe	.LBB8_5
-	movq	8(%rsp), %rdx
+	jbe	.LBB7_5
+	movq	24(%rsp), %rdx
 	movq	128(%rdx,%rsi), %r14
 	testq	%r14, %r14
-	je	.LBB8_5
+	je	.LBB7_5
 	shlq	$4, %rax
 	cmpq	$0, (%r14,%rax)
-	je	.LBB8_5
+	je	.LBB7_5
 	movq	304(%r13), %r12
 	cmpq	%r12, %rcx
-	jbe	.LBB8_5
+	jbe	.LBB7_5
 	shlq	$4, %r12
 	cmpq	$0, (%r14,%r12)
-	je	.LBB8_5
-	movq	8(%rsp), %rcx
+	je	.LBB7_5
+	movq	24(%rsp), %rcx
 	movq	%rsi, 88(%rsp)
 	movq	96(%rcx,%rsi), %rcx
 	movq	8(%r14,%rax), %rax
@@ -632,15 +620,15 @@ query_iter:
 	movq	%rcx, 176(%rsp)
 	movq	(%rcx,%rax), %r13
 	leaq	1(%r13), %rbx
-.Ltmp10:
+.Ltmp12:
 	movq	80(%rsp), %rdi
 	movq	%rbx, %rsi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp11:
-	movq	%r13, 48(%rsp)
+.Ltmp13:
+	movq	%r13, 8(%rsp)
 	movq	72(%rsp), %rax
 	cmpq	%r13, (%rax)
-	jbe	.LBB8_66
+	jbe	.LBB7_66
 	movq	%rbx, %rsi
 	movq	%r13, %rbp
 	shrq	$5, %rbp
@@ -650,34 +638,34 @@ query_iter:
 	movq	80(%rsp), %rax
 	movq	(%rax), %rax
 	orl	%ebx, (%rax,%rbp,4)
-.Ltmp12:
+.Ltmp14:
 	movq	120(%rsp), %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp13:
-	movq	%r13, 48(%rsp)
+.Ltmp15:
+	movq	%r13, 8(%rsp)
 	movq	112(%rsp), %rax
 	cmpq	%r13, (%rax)
-	jbe	.LBB8_67
+	jbe	.LBB7_67
 	movq	120(%rsp), %rax
 	movq	(%rax), %rax
 	orl	%ebx, (%rax,%rbp,4)
 	leaq	(%r14,%r12), %rax
 	cmpq	$0, (%rax)
 	movq	80(%rsp), %rdx
-	je	.LBB8_20
+	je	.LBB7_20
 	movq	8(%r14,%r12), %rax
 	shlq	$4, %rax
 	movq	176(%rsp), %rcx
 	movq	(%rcx,%rax), %r13
 	leaq	1(%r13), %rsi
-.Ltmp14:
+.Ltmp16:
 	movq	%rdx, %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp15:
-	movq	%r13, 48(%rsp)
+.Ltmp17:
+	movq	%r13, 8(%rsp)
 	movq	72(%rsp), %rax
 	cmpq	%r13, (%rax)
-	jbe	.LBB8_66
+	jbe	.LBB7_66
 	movl	$1, %eax
 	movl	%r13d, %ecx
 	shll	%cl, %eax
@@ -685,97 +673,97 @@ query_iter:
 	movq	(%rdx), %rcx
 	shrq	$5, %r13
 	orl	%eax, (%rcx,%r13,4)
-.LBB8_20:
-.Ltmp16:
-	movq	8(%rsp), %rax
+.LBB7_20:
+.Ltmp18:
+	movq	24(%rsp), %rax
 	movq	88(%rsp), %rcx
 	leaq	(%rax,%rcx), %rsi
 	movq	168(%rsp), %rdi
 	callq	*<() as bevy_ecs::query::fetch::WorldQuery>::update_archetype_component_access@GOTPCREL(%rip)
-.Ltmp17:
-	movq	8(%rsp), %rax
+.Ltmp19:
+	movq	24(%rsp), %rax
 	movq	88(%rsp), %rcx
 	movl	144(%rax,%rcx), %ebp
 	movq	%rbp, %r14
 	shrq	$5, %r14
-	movq	(%rsp), %r13
+	movq	16(%rsp), %r13
 	cmpq	64(%r13), %r14
-	jae	.LBB8_24
+	jae	.LBB7_24
 	movq	48(%r13), %rax
 	testq	%rax, %rax
-	je	.LBB8_24
+	je	.LBB7_24
 	movl	(%rax,%r14,4), %eax
 	btl	%ebp, %eax
-	jb	.LBB8_30
-.LBB8_24:
+	jb	.LBB7_30
+.LBB7_24:
 	leaq	1(%rbp), %rsi
-.Ltmp18:
+.Ltmp20:
 	movq	160(%rsp), %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp19:
-	movq	%rbp, 48(%rsp)
+.Ltmp21:
+	movq	%rbp, 8(%rsp)
 	movq	104(%rsp), %rax
 	cmpq	%rbp, (%rax)
-	jbe	.LBB8_69
+	jbe	.LBB7_69
 	movl	$1, %eax
 	movl	%ebp, %ecx
 	shll	%cl, %eax
-	movq	(%rsp), %r13
+	movq	16(%rsp), %r13
 	movq	48(%r13), %rcx
 	orl	%eax, (%rcx,%r14,4)
 	movq	288(%r13), %rsi
 	cmpq	280(%r13), %rsi
-	jne	.LBB8_29
-.Ltmp20:
+	jne	.LBB7_29
+.Ltmp22:
 	movq	144(%rsp), %rdi
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
-.Ltmp21:
-	movq	(%rsp), %r13
+.Ltmp23:
+	movq	16(%rsp), %r13
 	movq	288(%r13), %rsi
-.LBB8_29:
+.LBB7_29:
 	movq	272(%r13), %rax
 	movl	%ebp, (%rax,%rsi,4)
 	incq	%rsi
 	movq	%rsi, 288(%r13)
 	movq	88(%rsp), %rcx
-.LBB8_30:
-	movq	8(%rsp), %rax
+.LBB7_30:
+	movq	24(%rsp), %rax
 	movl	148(%rax,%rcx), %ebp
 	movq	%rbp, %rbx
 	shrq	$5, %rbx
 	cmpq	32(%r13), %rbx
-	jae	.LBB8_33
+	jae	.LBB7_33
 	movq	16(%r13), %rax
 	testq	%rax, %rax
-	je	.LBB8_33
+	je	.LBB7_33
 	movl	(%rax,%rbx,4), %eax
 	btl	%ebp, %eax
-	jb	.LBB8_5
-.LBB8_33:
+	jb	.LBB7_5
+.LBB7_33:
 	leaq	1(%rbp), %rsi
-.Ltmp22:
+.Ltmp24:
 	movq	152(%rsp), %rdi
 	callq	*fixedbitset::FixedBitSet::grow@GOTPCREL(%rip)
-.Ltmp23:
-	movq	%rbp, 48(%rsp)
+.Ltmp25:
+	movq	%rbp, 8(%rsp)
 	movq	96(%rsp), %rax
 	cmpq	%rbp, (%rax)
-	jbe	.LBB8_70
+	jbe	.LBB7_70
 	movl	$1, %eax
 	movl	%ebp, %ecx
 	shll	%cl, %eax
-	movq	(%rsp), %r13
+	movq	16(%rsp), %r13
 	movq	16(%r13), %rcx
 	orl	%eax, (%rcx,%rbx,4)
 	movq	264(%r13), %rsi
 	cmpq	256(%r13), %rsi
-	jne	.LBB8_4
-.Ltmp27:
+	jne	.LBB7_4
+.Ltmp29:
 	movq	136(%rsp), %rdi
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
-.Ltmp28:
-	jmp	.LBB8_3
-.LBB8_37:
+.Ltmp30:
+	jmp	.LBB7_3
+.LBB7_37:
 	movq	296(%r13), %r8
 	movq	304(%r13), %rax
 	movq	64(%rsp), %r9
@@ -783,44 +771,44 @@ query_iter:
 	movq	280(%r9), %rdi
 	xorl	%ecx, %ecx
 	cmpq	%r8, %rdi
-	jbe	.LBB8_41
+	jbe	.LBB7_41
 	testq	%rdx, %rdx
-	je	.LBB8_41
+	je	.LBB7_41
 	shlq	$4, %r8
 	cmpq	$0, (%rdx,%r8)
-	je	.LBB8_45
+	je	.LBB7_45
 	movq	8(%rdx,%r8), %rcx
 	leaq	(%rcx,%rcx,8), %rcx
 	shlq	$4, %rcx
 	addq	216(%r9), %rcx
-.LBB8_41:
+.LBB7_41:
 	xorl	%r15d, %r15d
 	cmpq	%rax, %rdi
-	jbe	.LBB8_47
-.LBB8_42:
+	jbe	.LBB7_47
+.LBB7_42:
 	testq	%rdx, %rdx
-	je	.LBB8_47
+	je	.LBB7_47
 	shlq	$4, %rax
 	cmpq	$0, (%rdx,%rax)
-	je	.LBB8_46
+	je	.LBB7_46
 	movq	8(%rdx,%rax), %rax
 	leaq	(%rax,%rax,8), %r15
 	shlq	$4, %r15
 	movq	64(%rsp), %rax
 	addq	216(%rax), %r15
-	jmp	.LBB8_47
-.LBB8_45:
+	jmp	.LBB7_47
+.LBB7_45:
 	xorl	%ecx, %ecx
 	xorl	%r15d, %r15d
 	cmpq	%rax, %rdi
-	ja	.LBB8_42
-	jmp	.LBB8_47
-.LBB8_46:
+	ja	.LBB7_42
+	jmp	.LBB7_47
+.LBB7_46:
 	xorl	%r15d, %r15d
-.LBB8_47:
+.LBB7_47:
 	movq	64(%rsp), %rdx
 	movl	760(%rdx), %eax
-	movl	%eax, 8(%rsp)
+	movl	%eax, 24(%rsp)
 	movq	272(%r13), %r8
 	movq	288(%r13), %rax
 	leaq	(%r8,%rax,4), %r9
@@ -829,26 +817,26 @@ query_iter:
 	xorl	%r11d, %r11d
 	xorl	%ebx, %ebx
 	xorl	%r12d, %r12d
-	jmp	.LBB8_50
+	jmp	.LBB7_50
 	.p2align	4, 0x90
-.LBB8_48:
+.LBB7_48:
 	xorl	%r13d, %r13d
-.LBB8_49:
+.LBB7_49:
 	incq	%r12
 	movss	(%r13), %xmm0
-	movl	8(%rsp), %esi
+	movl	24(%rsp), %esi
 	movl	%esi, (%rax)
 	addss	(%rdx), %xmm0
 	movss	%xmm0, (%rdx)
-	movq	(%rsp), %r13
+	movq	16(%rsp), %r13
 	movq	128(%rsp), %rsi
-.LBB8_50:
+.LBB7_50:
 	cmpq	%rbx, %r12
-	jne	.LBB8_54
+	jne	.LBB7_54
 	.p2align	4, 0x90
-.LBB8_51:
+.LBB7_51:
 	cmpq	%r9, %r8
-	je	.LBB8_64
+	je	.LBB7_64
 	movl	(%r8), %edx
 	addq	$4, %r8
 	imulq	$152, %rdx, %rax
@@ -857,44 +845,44 @@ query_iter:
 	cmovbeq	%r11, %rax
 	movq	88(%rax), %rbx
 	testq	%rbx, %rbx
-	je	.LBB8_51
+	je	.LBB7_51
 	movq	72(%rax), %rdi
 	xorl	%r12d, %r12d
-.LBB8_54:
+.LBB7_54:
 	leaq	(%r12,%r12,2), %rax
 	movl	4(%rdi,%rax,4), %r14d
 	cmpq	%r14, 136(%rcx)
-	jbe	.LBB8_58
+	jbe	.LBB7_58
 	movq	120(%rcx), %r13
 	movl	$0, %edx
 	testq	%r13, %r13
-	je	.LBB8_59
+	je	.LBB7_59
 	cmpl	$0, (%r13,%r14,8)
-	je	.LBB8_58
+	je	.LBB7_58
 	movl	4(%r13,%r14,8), %eax
 	movq	8(%rcx), %rdx
 	imulq	%rax, %rdx
 	addq	16(%rcx), %rdx
 	shlq	$2, %rax
 	addq	72(%rcx), %rax
-	jmp	.LBB8_59
+	jmp	.LBB7_59
 	.p2align	4, 0x90
-.LBB8_58:
+.LBB7_58:
 	xorl	%edx, %edx
-.LBB8_59:
+.LBB7_59:
 	cmpq	%r14, 136(%r15)
-	jbe	.LBB8_48
+	jbe	.LBB7_48
 	movq	120(%r15), %rbp
 	movl	$0, %r13d
 	testq	%rbp, %rbp
-	je	.LBB8_49
+	je	.LBB7_49
 	cmpl	$0, (%rbp,%r14,8)
-	je	.LBB8_48
+	je	.LBB7_48
 	movl	4(%rbp,%r14,8), %r13d
 	imulq	8(%r15), %r13
 	addq	16(%r15), %r13
-	jmp	.LBB8_49
-.LBB8_64:
+	jmp	.LBB7_49
+.LBB7_64:
 	movq	%r13, %rdi
 	addq	$232, %rsp
 	.cfi_def_cfa_offset 56
@@ -911,107 +899,97 @@ query_iter:
 	popq	%rbp
 	.cfi_def_cfa_offset 8
 	jmp	core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_iter_sparse::A,&query_state_iter_sparse::B)>>
-.LBB8_65:
+.LBB7_65:
 	.cfi_def_cfa_offset 288
-.Ltmp8:
-	leaq	.Lanon.a01df851b6197f632189e2f0fa818bdd.15(%rip), %rdx
+.Ltmp10:
+	leaq	.Lanon.a01df851b6197f632189e2f0fa818bdd.10(%rip), %rdx
 	callq	*core::panicking::panic_bounds_check@GOTPCREL(%rip)
-.Ltmp9:
-	jmp	.LBB8_74
-.LBB8_66:
-	leaq	48(%rsp), %rax
-	movq	%rax, 16(%rsp)
+.Ltmp11:
+	jmp	.LBB7_74
+.LBB7_66:
+	leaq	8(%rsp), %rax
+	movq	%rax, 32(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
-	movq	%rax, 24(%rsp)
+	movq	%rax, 40(%rsp)
 	movq	72(%rsp), %rcx
-	jmp	.LBB8_68
-.LBB8_67:
-	leaq	48(%rsp), %rax
-	movq	%rax, 16(%rsp)
+	jmp	.LBB7_68
+.LBB7_67:
+	leaq	8(%rsp), %rax
+	movq	%rax, 32(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
-	movq	%rax, 24(%rsp)
-	movq	112(%rsp), %rcx
-.LBB8_68:
-	movq	%rcx, 32(%rsp)
 	movq	%rax, 40(%rsp)
+	movq	112(%rsp), %rcx
+.LBB7_68:
+	movq	%rcx, 48(%rsp)
+	movq	%rax, 56(%rsp)
 	leaq	.Lanon.a01df851b6197f632189e2f0fa818bdd.6(%rip), %rax
 	movq	%rax, 184(%rsp)
 	leaq	.Lanon.a01df851b6197f632189e2f0fa818bdd.7(%rip), %rsi
-	jmp	.LBB8_72
-.LBB8_69:
-	leaq	48(%rsp), %rax
-	movq	%rax, 16(%rsp)
+	jmp	.LBB7_72
+.LBB7_69:
+	leaq	8(%rsp), %rax
+	movq	%rax, 32(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
-	movq	%rax, 24(%rsp)
+	movq	%rax, 40(%rsp)
 	movq	104(%rsp), %rcx
-	jmp	.LBB8_71
-.LBB8_70:
-	leaq	48(%rsp), %rax
-	movq	%rax, 16(%rsp)
+	jmp	.LBB7_71
+.LBB7_70:
+	leaq	8(%rsp), %rax
+	movq	%rax, 32(%rsp)
 	movq	core::fmt::num::imp::<impl core::fmt::Display for usize>::fmt@GOTPCREL(%rip), %rax
-	movq	%rax, 24(%rsp)
-	movq	96(%rsp), %rcx
-.LBB8_71:
-	movq	%rcx, 32(%rsp)
 	movq	%rax, 40(%rsp)
+	movq	96(%rsp), %rcx
+.LBB7_71:
+	movq	%rcx, 48(%rsp)
+	movq	%rax, 56(%rsp)
 	leaq	.Lanon.a01df851b6197f632189e2f0fa818bdd.2(%rip), %rax
 	movq	%rax, 184(%rsp)
 	leaq	.Lanon.a01df851b6197f632189e2f0fa818bdd.4(%rip), %rsi
-.LBB8_72:
-	movl	$2, %eax
-	leaq	16(%rsp), %rcx
-.LBB8_73:
+.LBB7_72:
+	leaq	32(%rsp), %rax
 	leaq	184(%rsp), %rdi
 	movq	$2, 8(%rdi)
 	movq	$0, 32(%rdi)
-	movq	%rcx, 16(%rdi)
-	movq	%rax, 24(%rdi)
-.Ltmp24:
-	movq	(%rsp), %r13
+	movq	%rax, 16(%rdi)
+	movq	$2, 24(%rdi)
+.Ltmp26:
+	movq	16(%rsp), %r13
 	callq	*core::panicking::panic_fmt@GOTPCREL(%rip)
-.Ltmp25:
-.LBB8_74:
+.Ltmp27:
+	jmp	.LBB7_74
+.LBB7_73:
+.Ltmp8:
+	leaq	.Lanon.a01df851b6197f632189e2f0fa818bdd.11(%rip), %rdx
+	callq	*bevy_ecs::query::state::QueryState<Q,F>::validate_world::panic_mismatched@GOTPCREL(%rip)
+.Ltmp9:
+.LBB7_74:
 	ud2
-.LBB8_75:
-	leaq	.Lanon.a01df851b6197f632189e2f0fa818bdd.12(%rip), %rax
-	movq	%rax, 16(%rsp)
-	movq	$98, 24(%rsp)
-	leaq	16(%rsp), %rax
-	movq	%rax, 48(%rsp)
-	leaq	<&T as core::fmt::Display>::fmt(%rip), %rax
-	movq	%rax, 56(%rsp)
-	leaq	.Lanon.a01df851b6197f632189e2f0fa818bdd.11(%rip), %rax
-	movq	%rax, 184(%rsp)
-	leaq	.Lanon.a01df851b6197f632189e2f0fa818bdd.14(%rip), %rsi
-	movl	$1, %eax
-	leaq	48(%rsp), %rcx
-	jmp	.LBB8_73
-.LBB8_76:
-.Ltmp29:
+.LBB7_75:
+.Ltmp31:
 	movq	%rax, %r14
-	movq	(%rsp), %r13
-	jmp	.LBB8_78
-.LBB8_77:
-.Ltmp26:
+	movq	16(%rsp), %r13
+	jmp	.LBB7_77
+.LBB7_76:
+.Ltmp28:
 	movq	%rax, %r14
-.LBB8_78:
-.Ltmp30:
+.LBB7_77:
+.Ltmp32:
 	movq	%r13, %rdi
 	callq	core::ptr::drop_in_place<bevy_ecs::query::state::QueryState<(&mut query_state_iter_sparse::A,&query_state_iter_sparse::B)>>
-.Ltmp31:
+.Ltmp33:
 	movq	%r14, %rdi
 	callq	_Unwind_Resume@PLT
 	ud2
-.LBB8_80:
-.Ltmp32:
+.LBB7_79:
+.Ltmp34:
 	callq	*core::panicking::panic_cannot_unwind@GOTPCREL(%rip)
 	ud2
-.Lfunc_end8:
-	.size	query_iter, .Lfunc_end8-query_iter
+.Lfunc_end7:
+	.size	query_iter, .Lfunc_end7-query_iter
 	.cfi_endproc
 	.section	.gcc_except_table.query_iter,"a",@progbits
 	.p2align	2, 0x0
-GCC_except_table8:
+GCC_except_table7:
 .Lexception1:
 	.byte	255
 	.byte	155
@@ -1020,24 +998,24 @@ GCC_except_table8:
 	.byte	1
 	.uleb128 .Lcst_end1-.Lcst_begin1
 .Lcst_begin1:
-	.uleb128 .Ltmp10-.Lfunc_begin1
-	.uleb128 .Ltmp28-.Ltmp10
-	.uleb128 .Ltmp29-.Lfunc_begin1
+	.uleb128 .Ltmp12-.Lfunc_begin1
+	.uleb128 .Ltmp30-.Ltmp12
+	.uleb128 .Ltmp31-.Lfunc_begin1
 	.byte	0
-	.uleb128 .Ltmp28-.Lfunc_begin1
-	.uleb128 .Ltmp8-.Ltmp28
+	.uleb128 .Ltmp30-.Lfunc_begin1
+	.uleb128 .Ltmp10-.Ltmp30
 	.byte	0
 	.byte	0
-	.uleb128 .Ltmp8-.Lfunc_begin1
-	.uleb128 .Ltmp25-.Ltmp8
-	.uleb128 .Ltmp26-.Lfunc_begin1
+	.uleb128 .Ltmp10-.Lfunc_begin1
+	.uleb128 .Ltmp9-.Ltmp10
+	.uleb128 .Ltmp28-.Lfunc_begin1
 	.byte	0
-	.uleb128 .Ltmp30-.Lfunc_begin1
-	.uleb128 .Ltmp31-.Ltmp30
 	.uleb128 .Ltmp32-.Lfunc_begin1
+	.uleb128 .Ltmp33-.Ltmp32
+	.uleb128 .Ltmp34-.Lfunc_begin1
 	.byte	1
-	.uleb128 .Ltmp31-.Lfunc_begin1
-	.uleb128 .Lfunc_end8-.Ltmp31
+	.uleb128 .Ltmp33-.Lfunc_begin1
+	.uleb128 .Lfunc_end7-.Ltmp33
 	.byte	0
 	.byte	0
 .Lcst_end1:
@@ -1117,52 +1095,24 @@ GCC_except_table8:
 	.type	.Lanon.a01df851b6197f632189e2f0fa818bdd.9,@object
 	.section	.rodata..Lanon.a01df851b6197f632189e2f0fa818bdd.9,"a",@progbits
 .Lanon.a01df851b6197f632189e2f0fa818bdd.9:
-	.ascii	"Attempted to use "
-	.size	.Lanon.a01df851b6197f632189e2f0fa818bdd.9, 17
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-41530a2346942c86/c9f9133/crates/bevy_ecs/src/query/state.rs"
+	.size	.Lanon.a01df851b6197f632189e2f0fa818bdd.9, 97
 
 	.type	.Lanon.a01df851b6197f632189e2f0fa818bdd.10,@object
-	.section	.rodata..Lanon.a01df851b6197f632189e2f0fa818bdd.10,"a",@progbits
+	.section	.data.rel.ro..Lanon.a01df851b6197f632189e2f0fa818bdd.10,"aw",@progbits
+	.p2align	3, 0x0
 .Lanon.a01df851b6197f632189e2f0fa818bdd.10:
-	.ascii	" with a mismatched World. QueryStates can only be used with the World they were created from."
-	.size	.Lanon.a01df851b6197f632189e2f0fa818bdd.10, 93
+	.quad	.Lanon.a01df851b6197f632189e2f0fa818bdd.9
+	.asciz	"a\000\000\000\000\000\000\000\330\000\000\000!\000\000"
+	.size	.Lanon.a01df851b6197f632189e2f0fa818bdd.10, 24
 
 	.type	.Lanon.a01df851b6197f632189e2f0fa818bdd.11,@object
 	.section	.data.rel.ro..Lanon.a01df851b6197f632189e2f0fa818bdd.11,"aw",@progbits
 	.p2align	3, 0x0
 .Lanon.a01df851b6197f632189e2f0fa818bdd.11:
 	.quad	.Lanon.a01df851b6197f632189e2f0fa818bdd.9
-	.asciz	"\021\000\000\000\000\000\000"
-	.quad	.Lanon.a01df851b6197f632189e2f0fa818bdd.10
-	.asciz	"]\000\000\000\000\000\000"
-	.size	.Lanon.a01df851b6197f632189e2f0fa818bdd.11, 32
-
-	.type	.Lanon.a01df851b6197f632189e2f0fa818bdd.12,@object
-	.section	.rodata..Lanon.a01df851b6197f632189e2f0fa818bdd.12,"a",@progbits
-.Lanon.a01df851b6197f632189e2f0fa818bdd.12:
-	.ascii	"bevy_ecs::query::state::QueryState<(&mut query_state_iter_sparse::A, &query_state_iter_sparse::B)>"
-	.size	.Lanon.a01df851b6197f632189e2f0fa818bdd.12, 98
-
-	.type	.Lanon.a01df851b6197f632189e2f0fa818bdd.13,@object
-	.section	.rodata..Lanon.a01df851b6197f632189e2f0fa818bdd.13,"a",@progbits
-.Lanon.a01df851b6197f632189e2f0fa818bdd.13:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/0607116/crates/bevy_ecs/src/query/state.rs"
-	.size	.Lanon.a01df851b6197f632189e2f0fa818bdd.13, 97
-
-	.type	.Lanon.a01df851b6197f632189e2f0fa818bdd.14,@object
-	.section	.data.rel.ro..Lanon.a01df851b6197f632189e2f0fa818bdd.14,"aw",@progbits
-	.p2align	3, 0x0
-.Lanon.a01df851b6197f632189e2f0fa818bdd.14:
-	.quad	.Lanon.a01df851b6197f632189e2f0fa818bdd.13
-	.asciz	"a\000\000\000\000\000\000\000\344\000\000\000\t\000\000"
-	.size	.Lanon.a01df851b6197f632189e2f0fa818bdd.14, 24
-
-	.type	.Lanon.a01df851b6197f632189e2f0fa818bdd.15,@object
-	.section	.data.rel.ro..Lanon.a01df851b6197f632189e2f0fa818bdd.15,"aw",@progbits
-	.p2align	3, 0x0
-.Lanon.a01df851b6197f632189e2f0fa818bdd.15:
-	.quad	.Lanon.a01df851b6197f632189e2f0fa818bdd.13
-	.asciz	"a\000\000\000\000\000\000\000\330\000\000\000!\000\000"
-	.size	.Lanon.a01df851b6197f632189e2f0fa818bdd.15, 24
+	.asciz	"a\000\000\000\000\000\000\000\321\000\000\000\016\000\000"
+	.size	.Lanon.a01df851b6197f632189e2f0fa818bdd.11, 24
 
 	.hidden	DW.ref.rust_eh_personality
 	.weak	DW.ref.rust_eh_personality
diff --git a/results/world_get.s b/results/world_get.s
index 962d324..84f56d7 100644
--- a/results/world_get.s
+++ b/results/world_get.s
@@ -1,26 +1,26 @@
 	.text
-	.file	"world_get.a84ac0076faecf36-cgu.0"
+	.file	"world_get.162f5808fe4fbcb8-cgu.0"
 	.section	.rodata.cst16,"aM",@progbits,16
 	.p2align	4, 0x0
 .LCPI0_0:
-	.zero	16,119
+	.zero	16,112
 .LCPI0_1:
-	.byte	33
-	.byte	71
-	.byte	57
-	.byte	155
-	.byte	89
-	.byte	59
-	.byte	8
-	.byte	110
-	.byte	64
-	.byte	154
-	.byte	130
-	.byte	94
-	.byte	109
 	.byte	206
-	.byte	136
-	.byte	231
+	.byte	160
+	.byte	23
+	.byte	159
+	.byte	149
+	.byte	175
+	.byte	21
+	.byte	119
+	.byte	71
+	.byte	255
+	.byte	29
+	.byte	118
+	.byte	132
+	.byte	108
+	.byte	247
+	.byte	69
 	.section	.text.world_get,"ax",@progbits
 	.globl	world_get
 	.p2align	4, 0x90
@@ -67,7 +67,7 @@ world_get:
 	movq	88(%rdi), %r9
 	movq	96(%rdi), %r10
 	leaq	-24(%r9), %r11
-	movabsq	$-1209748388455665611, %rbx
+	movabsq	$-2198312759473167386, %rbx
 	xorl	%esi, %esi
 	movdqa	.LCPI0_0(%rip), %xmm0
 	pcmpeqd	%xmm1, %xmm1
@@ -175,7 +175,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/0607116/crates/bevy_ecs/src/world/unsafe_world_cell.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-41530a2346942c86/c9f9133/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 073b9a0..bc3f74a 100644
--- a/results/world_get_sparse.s
+++ b/results/world_get_sparse.s
@@ -1,26 +1,26 @@
 	.text
-	.file	"world_get_sparse.81c10637457c0881-cgu.0"
+	.file	"world_get_sparse.3f3e87acbbcebd51-cgu.0"
 	.section	.rodata.cst16,"aM",@progbits,16
 	.p2align	4, 0x0
 .LCPI0_0:
-	.zero	16,56
+	.zero	16,46
 .LCPI0_1:
-	.byte	201
-	.byte	106
-	.byte	85
-	.byte	71
-	.byte	98
-	.byte	195
-	.byte	216
-	.byte	242
-	.byte	248
-	.byte	120
-	.byte	244
-	.byte	23
-	.byte	2
-	.byte	86
-	.byte	112
-	.byte	13
+	.byte	145
+	.byte	225
+	.byte	209
+	.byte	67
+	.byte	243
+	.byte	204
+	.byte	228
+	.byte	46
+	.byte	133
+	.byte	8
+	.byte	35
+	.byte	131
+	.byte	41
+	.byte	69
+	.byte	25
+	.byte	125
 	.section	.text.world_get,"ax",@progbits
 	.globl	world_get
 	.p2align	4, 0x90
@@ -58,7 +58,7 @@ world_get:
 	movq	88(%rdi), %rsi
 	movq	96(%rdi), %r9
 	leaq	-24(%rsi), %r10
-	movabsq	$8188646145276575997, %r11
+	movabsq	$6639243874692363109, %r11
 	xorl	%edx, %edx
 	movdqa	.LCPI0_0(%rip), %xmm0
 	pcmpeqd	%xmm1, %xmm1
diff --git a/results/world_insert_or_spawn_batch.s b/results/world_insert_or_spawn_batch.s
index 30f58b7..0e31e5b 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.42d8dff60e736b49-cgu.0"
+	.file	"world_insert_or_spawn_batch.bb1a85a00ff01800-cgu.0"
 	.section	".text.core::ptr::drop_in_place<alloc::vec::into_iter::IntoIter<(bevy_ecs::entity::Entity,(world_insert_or_spawn_batch::A,world_insert_or_spawn_batch::B))>>","ax",@progbits
 	.p2align	4, 0x90
 	.type	core::ptr::drop_in_place<alloc::vec::into_iter::IntoIter<(bevy_ecs::entity::Entity,(world_insert_or_spawn_batch::A,world_insert_or_spawn_batch::B))>>,@function
@@ -259,16 +259,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	.LBB7_3
 	movq	(%rbx), %rcx
-	imulq	$88, %rax, %rax
+	shlq	$5, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -341,16 +342,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	.LBB8_3
 	movq	(%rbx), %rcx
-	shlq	$3, %rax
+	imulq	$88, %rax, %rax
 	movq	%rcx, 8(%rsp)
 	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
@@ -425,17 +426,16 @@ 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
-	shlq	$3, %rsi
+	leaq	(,%r14,8), %rdx
+	shlq	$2, %rsi
 	testq	%rax, %rax
 	je	.LBB9_3
 	movq	(%rbx), %rcx
-	shlq	$5, %rax
+	shlq	$3, %rax
 	movq	%rcx, 8(%rsp)
-	movq	$8, 16(%rsp)
+	movq	$4, 16(%rsp)
 	movq	%rax, 24(%rsp)
 	jmp	.LBB9_4
 .LBB9_3:
@@ -511,13 +511,13 @@ alloc::raw_vec::RawVec<T,A>::reserve_for_push:
 	shrq	$60, %rcx
 	sete	%sil
 	leaq	(,%r14,8), %rdx
-	shlq	$2, %rsi
+	shlq	$3, %rsi
 	testq	%rax, %rax
 	je	.LBB10_3
 	movq	(%rbx), %rcx
 	shlq	$3, %rax
 	movq	%rcx, 8(%rsp)
-	movq	$4, 16(%rsp)
+	movq	$8, 16(%rsp)
 	movq	%rax, 24(%rsp)
 	jmp	.LBB10_4
 .LBB10_3:
@@ -2189,28 +2189,28 @@ hashbrown::raw::RawTable<T,A>::reserve_rehash:
 	.section	.rodata.cst16,"aM",@progbits,16
 	.p2align	4, 0x0
 .LCPI14_0:
-	.zero	16,112
+	.zero	16,103
 .LCPI14_1:
-	.byte	105
-	.byte	51
-	.byte	104
-	.byte	2
-	.byte	49
-	.byte	129
-	.byte	124
-	.byte	228
-	.byte	114
-	.byte	145
-	.byte	45
-	.byte	182
-	.byte	77
-	.byte	72
-	.byte	48
-	.byte	191
+	.byte	150
+	.byte	101
+	.byte	94
+	.byte	52
+	.byte	240
+	.byte	159
+	.byte	119
+	.byte	58
+	.byte	239
+	.byte	31
+	.byte	177
+	.byte	171
+	.byte	213
+	.byte	46
+	.byte	138
+	.byte	156
 .LCPI14_2:
-	.zero	16,11
+	.zero	16,3
 .LCPI14_3:
-	.zero	16,125
+	.zero	16,126
 	.section	.text.world_insert_or_spawn_batch,"ax",@progbits
 	.globl	world_insert_or_spawn_batch
 	.p2align	4, 0x90
@@ -2253,7 +2253,7 @@ world_insert_or_spawn_batch:
 	shlq	$4, %rax
 	addq	184(%rsp), %rax
 	movq	%rax, 352(%rsp)
-	movabsq	$-2270317404999776739, %r12
+	movabsq	$-3568677092711924658, %r12
 	movl	760(%r14), %eax
 	movl	%eax, 68(%rsp)
 	leaq	488(%r14), %rbp
@@ -2712,10 +2712,10 @@ world_insert_or_spawn_batch:
 	callq	hashbrown::raw::RawTable<T,A>::reserve_rehash
 .Ltmp3:
 .LBB14_49:
-	movabsq	$-7532331098027703284, %rbx
+	movabsq	$19979787217326158, %rbx
 	movq	%r14, %rcx
-	movabsq	$-2929124292082964719, %r15
-	movabsq	$1704093552351749861, %r14
+	movabsq	$-735620314498484544, %r15
+	movabsq	$512786625045126592, %r14
 	movq	$8, 160(%rsp)
 	pxor	%xmm0, %xmm0
 	movdqu	%xmm0, 168(%rsp)
@@ -2772,9 +2772,9 @@ world_insert_or_spawn_batch:
 	xorl	%esi, %esi
 	callq	alloc::raw_vec::RawVec<T,A>::reserve_for_push
 .Ltmp15:
-	movabsq	$5161047740968808003, %rbx
-	movabsq	$3893310790289506856, %r14
-	movabsq	$-300519420924227256, %rdi
+	movabsq	$-4171830141351967397, %rbx
+	movabsq	$616562911678838443, %r14
+	movabsq	$-244722698453483641, %rdi
 	movq	160(%rsp), %rax
 	movq	176(%rsp), %rcx
 	movq	%rax, 24(%rsp)
@@ -2856,7 +2856,7 @@ world_insert_or_spawn_batch:
 	movq	$4, 104(%rsp)
 	movq	$4, 112(%rsp)
 	movq	$0, 120(%rsp)
-	leaq	.Lanon.ec88cfe8160c27a9dec3209ea7295488.4(%rip), %rax
+	leaq	.Lanon.ec88cfe8160c27a9dec3209ea7295488.5(%rip), %rax
 	movq	%rax, 128(%rsp)
 	movq	$30, 136(%rsp)
 	movq	$0, 144(%rsp)
@@ -2950,8 +2950,8 @@ world_insert_or_spawn_batch:
 .LBB14_79:
 	leaq	-16(%rdx), %rdi
 	andq	%rcx, %rdi
-	movb	$11, (%rax,%rdx)
-	movb	$11, 16(%rdi,%rax)
+	movb	$3, (%rax,%rdx)
+	movb	$3, 16(%rdi,%rax)
 	negq	%rdx
 	andb	$1, %sil
 	movzbl	%sil, %ecx
@@ -2982,7 +2982,7 @@ world_insert_or_spawn_batch:
 	movq	$4, 104(%rsp)
 	movq	$4, 112(%rsp)
 	movq	$0, 120(%rsp)
-	leaq	.Lanon.ec88cfe8160c27a9dec3209ea7295488.5(%rip), %rax
+	leaq	.Lanon.ec88cfe8160c27a9dec3209ea7295488.4(%rip), %rax
 	movq	%rax, 128(%rsp)
 	movq	$30, 136(%rsp)
 	movq	$0, 144(%rsp)
@@ -3047,7 +3047,7 @@ world_insert_or_spawn_batch:
 	movq	%rax, 80(%r15)
 	movq	88(%r15), %rax
 	movq	96(%r15), %rcx
-	movabsq	$-300519420924227256, %rdi
+	movabsq	$-244722698453483641, %rdi
 	andq	%rcx, %rdi
 	movdqu	(%rax,%rdi), %xmm0
 	pmovmskb	%xmm0, %edx
@@ -3076,8 +3076,8 @@ world_insert_or_spawn_batch:
 .LBB14_93:
 	leaq	-16(%rdx), %rdi
 	andq	%rcx, %rdi
-	movb	$125, (%rax,%rdx)
-	movb	$125, 16(%rdi,%rax)
+	movb	$126, (%rax,%rdx)
+	movb	$126, 16(%rdi,%rax)
 	negq	%rdx
 	andb	$1, %sil
 	movzbl	%sil, %ecx
@@ -3170,16 +3170,16 @@ world_insert_or_spawn_batch:
 .LBB14_105:
 	leaq	-16(%rdx), %rdi
 	andq	%rcx, %rdi
-	movb	$112, (%rax,%rdx)
-	movb	$112, 16(%rdi,%rax)
+	movb	$103, (%rax,%rdx)
+	movb	$103, 16(%rdi,%rax)
 	negq	%rdx
 	leaq	(%rdx,%rdx,2), %rdx
 	andb	$1, %sil
 	movzbl	%sil, %ecx
 	subq	%rcx, 528(%r14)
-	movabsq	$-1982567688456096919, %rcx
+	movabsq	$4213011830447957398, %rcx
 	movq	%rcx, -24(%rax,%rdx,8)
-	movabsq	$-4670153314977083022, %rcx
+	movabsq	$-7166864361763299345, %rcx
 	movq	%rcx, -16(%rax,%rdx,8)
 	leaq	(%rax,%rdx,8), %rcx
 	addq	$-8, %rcx
@@ -3363,7 +3363,7 @@ GCC_except_table14:
 	.type	.Lanon.ec88cfe8160c27a9dec3209ea7295488.0,@object
 	.section	.rodata..Lanon.ec88cfe8160c27a9dec3209ea7295488.0,"a",@progbits
 .Lanon.ec88cfe8160c27a9dec3209ea7295488.0:
-	.ascii	"/home/james/.cargo/git/checkouts/bevy-f7ffde730c324c74/0607116/crates/bevy_ecs/src/archetype.rs"
+	.ascii	"/home/james/.cargo/git/checkouts/bevy-41530a2346942c86/c9f9133/crates/bevy_ecs/src/archetype.rs"
 	.size	.Lanon.ec88cfe8160c27a9dec3209ea7295488.0, 95
 
 	.type	.Lanon.ec88cfe8160c27a9dec3209ea7295488.1,@object
@@ -3391,13 +3391,13 @@ GCC_except_table14:
 	.type	.Lanon.ec88cfe8160c27a9dec3209ea7295488.4,@object
 	.section	.rodata..Lanon.ec88cfe8160c27a9dec3209ea7295488.4,"a",@progbits
 .Lanon.ec88cfe8160c27a9dec3209ea7295488.4:
-	.ascii	"world_insert_or_spawn_batch::A"
+	.ascii	"world_insert_or_spawn_batch::B"
 	.size	.Lanon.ec88cfe8160c27a9dec3209ea7295488.4, 30
 
 	.type	.Lanon.ec88cfe8160c27a9dec3209ea7295488.5,@object
 	.section	.rodata..Lanon.ec88cfe8160c27a9dec3209ea7295488.5,"a",@progbits
 .Lanon.ec88cfe8160c27a9dec3209ea7295488.5:
-	.ascii	"world_insert_or_spawn_batch::B"
+	.ascii	"world_insert_or_spawn_batch::A"
 	.size	.Lanon.ec88cfe8160c27a9dec3209ea7295488.5, 30
 
 	.hidden	DW.ref.rust_eh_personality