Bug 901416 - Follow-up fix for Werror bustage.