Start refactor to better match machine tokens.