Tidied up timing constraints. May help with problems seen at DESY with 1e000014

Changes w.r.t. 1e000014:

Tidied up timing constraints