simplify and cleanup control flow for collocated motion vectors