I agree.  Copy/paste was just simpler at the time, but yes we should definitely hoist it out at some stage.