Merge: Cleanup lib/dom