Remove no longer necessary use of AC_SUBST