don't allow special terminal string in our CFGs. other cleanup.