Improved detection of primary wire for a signal in opt_clean
Now also move net labes to the right position in splice cmd