This fixes the installcheck part.  The check part has additional
problems that will be addressed in a separate commit.