Use proper parsing instead of regex in internal/reader/processor/#3001