Improved the testing in the consistency testing calculate() method.
This mimicks the J(w) mapping changes of r5743 and r5744.
Authored by: bugman 2008-04-21
Parent: [r5918]
Child: [r5920]