Stricter numerics; workaround for SI-8649.