Add a few parser emission functions, some pleasant rename changes