issue #21368: Missed some spots. Also make picker friendlier.