Fix build order when building with integer-simple

The problem hasn't shown up with integer-gmp, but I can't see
why it couldn't happen in that case too.
More build ordering fixes