Fix build problems that some (but oddly, not all) people were having with 1.5.8.