OOZIE-1586: Changes suggested by Robert Kanter