Put in some fixes for the new cody-highlights code path (#1993)

Put in some fixes for the new cody-highlights code path (#1993) #2584