Minor code factoring.