Cleanup after refactorings in data.js.