Slight refactoring to pick up changes to webServices library.