Okay
Fix some cyclic dependencies in NZMATH