minor changes

condensed some code in FasterStupidLocker, starting on enhancing dedup
with BetterLocker