skip_results and empty_index now merged upstream so can build from master.