Refactor how the manual unapply is built