Minor cleanup in codebook.