It looks right on my end. Some thought will have to be put into making this use-case a bit more elegant in 4.1, I think.