Updates for consistency with previous changes made for Swig 2.0 compatibility.