Missed some fixes from the last commit.
Missed some fixes from the last commit.


Former-commit-id: 2adf44e22f355ac5a9e50758f4e728d943f9f473 [formerly e90a7cf47b3d98ea68cdfc1e204b77ef7e2860a2] [formerly c9ba1f668f2c4c6b81305a1cf8371b8cac70e6b8 [formerly e2bc2f8850434f90a5c37f9129fd7fcf70506889]] [formerly d004c5680456a0c57b6396c78906c9ef1c79a4fe] [formerly cedc4c921eb9cd2ad2e5df1b3eb681c0769e31b0 [formerly 67d7b8c90f686124b0dc2844888e0599aafac0b0]]
Former-commit-id: cedc4c921eb9cd2ad2e5df1b3eb681c0769e31b0
Former-commit-id: 047cb7654b890cf40db6a97fd5159fa7f362bda1
Former-commit-id: 87a7d3a78c633b8292926249743d1c4c4351b70f [formerly d31e0806e207daf824e21ab34ca8f7c06d98f485]
Former-commit-id: 4d8fc18229cfd332930d113b4034d2cf7d57b59e
gsarma/PyOpenWorm,gsarma/PyOpenWorm,hnunner/PyOpenWorm,kaustubhcs/PyOpenWorm,travs/PyOpenWorm,openworm/PyOpenWorm,openworm/PyOpenWorm