Comment tweaks in CodeGen