Weren't these wait times supposed to become constants, like SHORT_WAIT and LONG_WAIT or something similar?