Change other "constant-expressions" to use the right macro