Ouch - revert some cruft that somehow got into r28751. Guess my working copy had some test merge pieces remaining in it.