WELD-1753 Better code reuse