Log Message:
Fix return types for ancient code that doesn't know about "void", because
clang objects. Other half of last weekend's patch, which I apparently
erased by accident (or something) before committing.

While here also patch up some illegal type mixing in tr2.c that gcc
warns about.