whitespace police, type cleanup
typo fix
r has been deprecated for thumb key
missing regexp from previous
missing re module
base should be part of hash key
again, base part of hash key
no longer applicable
no longer applicable
no longer applicable
cleanup
locks need rethinking for their tests, comment for now
no longer applicable