Kirkwood, minor improvements by Neil Conway. The regression tests have
been updated and the catversion has been bumped.