Adds a dependency over hoe that was missing before, also fixes tests with recent hoes.
x86 keyword restored.
~ppc64 done