Revert "More monster2.c cleanups."

This reverts commit b88177fd034d01dd88f5d5128431328bdffcf352.