Fix conflicting type and work around compiler stupidity.