Remaining switches to using identifier().