Tidies up data source identifier query in Program.