Replace lock() do-method usage with @lock
#65
+24
−45
Merged