argparse: fixup buildxpi after argparse changes