I think it'd be funnier to have like, construction ninjas that fix things when you're not looking and a variety of crazy medicine people in the sick bay. Feels like it'd mesh better with crazy school of facepunching, you know? I'm not saying the headmaster can't or shouldn't be powerful but turning him into Handwave Man just feels like the least fun way to go about it.