More (saner) refactoring of pool management