Clean up parser state machine

The parser's state machine includes sub-states for the string, tuple, variable states which should be integrated into the state machine. We need this because the parser should output it's final state after failure to provide autocomplete with the ability to guess the next set of characters.