Forgot to conditionally omit all the relevant imports in the previous
commit; oops.