More WIP for ember-data upgrade.