Refactor some more: fix potential loophole with free and role'd agents.
Refactor some more: fix potential loophole with free and role'd agents.

johnbachman/indra,sorgerlab/indra,pvtodorov/indra,johnbachman/indra,pvtodorov/indra,sorgerlab/belpy,sorgerlab/indra,pvtodorov/indra,bgyori/indra,sorgerlab/belpy,bgyori/indra,johnbachman/belpy,johnbachman/indra,sorgerlab/belpy,johnbachman/belpy,bgyori/indra,sorgerlab/indra,pvtodorov/indra,johnbachman/belpy