Minor rewrites in push/pull