Refactor how we handle string terminals.