Updates to follow @garborg's changes to DataFrame.