Yet more locker work.

Kent