Indeed, thanks. I'll look for more refactorings once I fix the build on clang.