Clean up Makefile.in: case, dead code, comments, formatting