Clang tooling woes 2

Relevant post (and its follow up response):