Minor optimizations and actually set SOFTHANGUP_TIMEOUT if appropriate