Bug 20948: Simplify existing code