Pool spec fixes

This is the same set of fixes in #114 but without the weird, interleaved commits that expose my severe lack of git-fu.