Various improvements and CINT compatibility.