Refactored labelInImage() in r12911 (branch-6-0). Will commit to trunk as part of RFC 77 work. -Steve