Minor re-factoring.