Try harder to keep the diff stuff right