Some non-breaking interface refactoring - better sharing of common label methods