WELD-1476 Eliminate Container.instance() usage