Consolidate target selection code into single get_target() that handles both names...