Minor code consolidation & cleanup.