Squash some more strange nil bugs.