Just an idea...after the specific roles are chosen (werewolf, seer, hunter, etc.), what about
then picking the two Masons? Then there's the possibility of someone having multiple roles.
Though you'd probably want to exclude Werewolves and the Seer from that list.
*shrugshrug* Just thinking *shrugshrug*
Edit: Oh yeah...if Nilp plays - will his alter-egoes count as two extra players?
Heaven help us if we have
five wolves.
Or three seers even! Yipe!