Merge "Remove CodeItem accessor functions"