Avoid references to Axiom implementation classes
3 files changed