Massively tidy up command parsing code, detect non-numeric times.