Code cleanup after reading warden's source code.