It was a bunch of extra steps to get the other references to be conditional, though it would probably be a good idea.