Merge "Fix braino in ArtCode refactoring."