Two different refactors for different reasons.