Require a few more things.

Might fix https://www.w3.org/Bugs/Public/show_bug.cgi?id=20918