Refactor match #8221

Job	Run time
test	0s
cargo-test-sbf (token/program)	8m 44s
cargo-test-sbf (instruction-padding/program, token/program-2022, token/program-2022-test)	14m 35s
cargo-test-sbf (associated-token-account/program, associated-token-account/program-test)	11m 33s
cargo-test-sbf (token-upgrade/program)	10m 54s
cargo-test-sbf (feature-proposal/program)	9m 9s
check	0s
cargo-test-sbf (governance/addin-mock/program, governance/program)	14m 24s
cargo-test-sbf (memo/program)	10m 36s
cargo-test-sbf (name-service/program)	9m 1s
cargo-test-sbf (stake-pool/program)	13m 25s
cargo-test-sbf (single-pool/program)	11m 12s
	1h 53m 33s

Provide feedback