This patch moves the tmr_margin assignment until after the check for a
correct timeout value. (Plus another minor cosmetic thing.)