This seems to be getting far afield of this PR's scope of merely getting rid of anything other than xblock knowing and storing scope (metadata v data v ..)