@IgorMinar wanted an msapp variable that was checked. @caitp Are you saying that we should get rid of this line and look only for MSApp at all places where we are doing the checks?