A very difficult test case.
Makefile updates plus a few comment changes.