Tiny code cleanup in parse_attributes