Refactor target hook for tail duplication as requested by Chris.