enhance version macro evaluation