Begin refactor to handle matching identifiers and literals