Fix #682.

@joneshf @jdegoes Please review. The slamdata repo builds with these changes, as do the test-everything, ps-in-ps and core-tests repos.

When this and the other 0.6 items are reviewed, I will make a 0.6 RC 1 build.

Thanks.