Fix batch positioning

This fixes a test that has been failing occasionally for a while now. And, unless I'm overlooking something, the positioning logic was unnecessarily complicated.