Peter, I don't see any obvious reason why your patches can't be permanently applied to the axiom sources. Did I miss something that would break if aldor is not around? Tim