Axiomatizing maximal progress and discrete time