Reduce the complexity of the artifact class a bit.