IMO the underscore renames for _parse_xxx_attribute should be done in this diff because they're no longer unused. My motivation is to keep the number of underscores as minimal as possible for each diff.
Anyway I see they're renamed in the following diff and I'm OK with that too