Rename delta.* to partition.*, and clean up some duplicated variable definitions.