Move a call to a place that makes more sense.