Fix up build errors introduced in transition away from my private frameworks.