Fix type/argument shadowing warnings

This is just to shut IDEA up - but also didn't seem like a terrible idea. Happy to ignore them if you prefer.