Minor: Code cleanup - refs BT#7010