Ah, I'm sorry - I missed that you'd edited this last post.

What you have there seems reasonable.