Clean up the Pool class.
Fix a couple places in Locker that weren't using custom connections when they should.
Clean up Locker somewhat.
More minor cleanup.