Changes made for consistency with magcheck and diracsolver.