setImageArtifact tidied up with other stuff.