WELD-1787 Resolvables - simplify ResolvableBuilder