Perhaps we can chat about this in person when you're back -- not sure how exactly you envision this. I've done the same DRYing up here as above, though.