Remove some uses of isset that might behave differently under mgd2 and
mgd2