Work on cleaning up ComponentLabeling