Move the label mapping to the new class based line parser too.

Very much untested again, sorry.