Now that the large kernel refactor is merged, we can eliminate the remaining variable shadowing cases.