removed leading scope operators on parms in defines