New labeller functions from @stefanedwards.
Squashed from #910