Avoid unnecessary unwraps of current_class, fixes #480 #604

Job	Run time
tests / cargo-test-debug (windows-2022)	3m 46s
tests / cargo-test-debug (ubuntu-24.04)	2m 41s
cargo fmt	20s
tests / cargo test (linux, release)	-7s
	6m 40s

Provide feedback