Clean up cross-compilation package creation, part 2 of 2