Fix "Avoid variables with short names like $id.".