If it's not much work and will ease maintenance, sure! There are probably more cases like this in the parsers. I think the way to go forward is to modularize `extract()` into separate methods that parse attributes or groups of attributes.