ArtifactVisitor inheritance cleanup