Seems that we have a lot of places where evilified-state-evilify has been used instead of evilified-state-evilify-map. This causes issues with shadowing of evilified maps as this is only done by the later of those two. Fixes #15150