The code is now in much better shape. I use function snarfing for
all files and proper Makefile rules. Ugly hacks to finish the
first assignment are undone.