Added a check to make sure variables in definitions are correct (i.e. they are disjoint from other roles).