Improved #39 now that the DOM has improved.