RUBY-621: remove lock_with_hack (unused)
RUBY-621: remove each_with_object