Update utility to support macro replace using int value