Yep, we have to do this and it sucks :( There might be some super clever ways to avoid that but it might make things very hard to read, so I think it's the best way for a task like this.