Minor cleanups.
Adjust a compatibility method for speed and probably compatibility.