Move around locks and do a better job ensuring paths exist.