#736 reuse more code across both WSDL and WADL