tweak alignment code in parse_args.cc and revert bs test changes