Cleanups to get new pkg_config FindPackages magic working for source-build tclap