Import from Grunthack improvements to the C343-14 fix, related to artifact names starting with 'The'.