Fix compilation with -property and reduce the number of Clock.currTime() calls.