More work in progress on amd/dojo 2.0 conversion