looks like this part is also referencing the old style of passing the `lock:` option. Can you modify it too?