Bring grimoire.web.* refactor to feature parity with develop branch.