That looks good to me, it eliminates all confusion as far as I can tell.