Seems like this whole section might read a little easier if we pulled out the check for `self.ishelpshiftEnabled`.