Merge "Remove the CodeOffset helper class."