Minor CMake cleanup while prepping LLabs for building