Updated to reflect 3.8 compatibility.