Ensure that ruby block adding keys is idempotent
Update idempotent guard as recommended in pull request.
Cleanup warnings about same prior resources.