Move some things to HOOK_CONF_END

This is incredibly fragile at the moment, and depends on the order in
which hooks are called! Right now, core hooks run before module hooks,
but this cannot be guaranteed forever.