Yeah I'm not sold on this as a final solution. I'd almost rather kill this whole class for now and focus on code-gen since it's annoying.