Changes to make Backfill.php and Binaries.php faster.