Fixed the Stupid(tm).
The Makefile was using tamer in ../mprpc/tamer instead of mprpc/tamer.
Needless to say, all the ugly tamer problems I was having were solved
by fixing the version mismatch arising from using the wrong tamer.
Also, fixed some bugs in puppet masked by the tamer problems.
Also, switched back to using tamer __LINE__ markings. I was wrong.