updated include-self context cases