Minor code cleanup - refs BT#7010