Re-add MPIContext.delete_key. Fix some whitespace errors.