Changed 'look for existing arg check code' based on discussion in #11