Improve some "standard" CMake Find modules by using macros