Original diff from Nicholas Marriot (MAINTAINER); thanks! Debugging on macpcc a la merdely@ and MAINTAINER. ok merdely@