Minor cleanup

I’m also disabling that one pesky test that keeps failing on Travis
until I can figure out what’s going on.