Cosmetic changes in pophist.c