Graphing and lexer machine cleanups and conveniences