Bug 945045 Followup to compile with external linkage r=Standard8
Bug 844148 Followup to compile with external linkage r=irving