Refactor duck reverse manipulation into duckmatic