Add uniquify so buffer names look good.