Don't recursively call combine and substitute if the underlining type is raw

Don't recursively call combine and substitute if the underlining type is raw #99