Bug 880330 - Refactor dom to use the new options API (2/2); r=khuey