I think it's an awesome idea to go through and do that.  (Also to change things that have default :lockfile, nil to configurable :lockfile--i.e. no default).  I just wanted to keep behavior fixed in this patch.