Clean up some remains from the gcc2 days.