Expand date marker on define to include h/m/s