Preparation for gcc 3.4.6 import.