Sat Aug 12 02:27:35 EDT 2006 rsc
    I made a simpler change.
    I'm not as convinced about the new constnats.