Thanks. I landed on this solution. It feels imperfect, but I’m happy to be able to compile and push my code.