Squash me in if possible
Add undoc options for diff
Move me to remove TODOs
Remove deprecated option