Bug 7739 follow-up for capital cases