Bug 893117: Fix warnings-as-errors bustage