Improved RF Measurements of SRF Cavity Quality Factors