An improved, "phase-relaxed" F-statistic for gravitational-wave data analysis