dsymonds confirms that this one works. R=r DELTA=50 (23 added, 17 deleted, 10 changed) OCL=28433 CL=28444