Per the letter of the spec, I think it's in the right place. To achieve what we want, I think it's in the wrong place. I'm tempted to do both - I'll code it that way for now, and we can discuss when you wake up.