Reverted removal of 'const' from TagItem arrays/pointers in r50146