Minor: Use DOMUtils helpers consistently in more places.

Change-Id: I71b54a1e1dc0b45ed6bf876cda702207d7597768