Using `#define FOO ${FOO}` yielded `#define FOO` if ${FOO} is undefined,
which breaks code below (i.e. the LPSOLVE/ALBERTA stuff).

This reverts commit 35aa624d.

This reverts commit db210150.