On the surface that sounds better, but it's hard to say until I see it.  If it's simplest to keep this here, that's fine; just put a comment explaining why.