Refactor Christopher's patch.