Replaced current member definitions for 3.1 compatibility.