Use locality in what's passed to loader
2.0.0