That looks like a good patch to my old eyes. That race switch does't look that bad to me if there is no discernable flag for mounts. Do you have to do the level == 30 part?

Are there are handlers that modify race? The illusion handler or the shroud handler? Any of the spawn update handlers? I guess things don't ever change into a mount or an aura so maybe it's not a big deal.

Helicopter backpack!??!