Bug fixes and improvements to embedded lexers.