Re-merge concurrent,timeout,unique,st,getopt into base