Improved parsing of extras.