Issue #119: further cleanup for Makefile