More changes to bring in line with latest ncWMS 1.x code (SVN rev 1085).