Agreed. I think it would become quite a bit simpler if this weren't persistent and you could just move some references around. But yes, it is very verbose.