Simplify cuddlefish path overloading code.
Address review.