gpgscm: Refactor cell finalization.