Refactor out the unlabelled check

Also, fix some docs