Issue #124: Incorporate @nicklfitz updates to Questa Makefile