Wrapped up changes to DataManip from Neely's comments.