Simplify and update with Dojo 1.10