don't include dojo/_base/lang twice (clean-up of r31215), \!strict
fix local references to parser to be consistent with dojo naming conventions, \!strict