Further cleanup related to removing old lexical handling code