More TODO.
Fix unnecessary WANTLIBs.