More tweaks that still don't quite build libgroove.