Prevent more shadowing (I've become IDE-dependent!)