Reworking Mastery of Magic