Fixed bug 982 and removed defines in hog.h.