Eliminating duplicated code (take 2...).