Bug 11592: (QA followup) Simplify code