Determine correct label for more headers

Notably, this now determines the correct label for labels like "G-13A" and "G-13(A)(2)".

Also, removes some complexity that attempted to treat G-13(A) as a child of G-13 -- this turns out to not be correct. Instead G-13 and G-13(A) are supposed to be on the same level.