Toss unused field.
Extract label handling code into functions.

Tidies the code, and will make the upcoming refactor a little easier.
Switch over to using label identity for matching.

Means we can elminate a couple of hashes, but also that labels will no
longer need to have a unique name generated.