Fix undefined symbol errors introduced with previous commit.