Self-review plus gcc build fix.