Remove more signature repetition.
Bring labels into scope.