#SB-118: Implement artifact metadata support

Minor cleanups.