Add underscore parsing.