Fix x86(_64) builds after last commit.