Continued removing dependence on label() accessor.
Almost finished removing label accessor.