Fix another out-of-order randomly triggered bug

Testing with Go 1.3 exposed another implicit ordering bug - I noticed this cropping up in the run-unit-tests-precise-amd64 CI builds also, which makes me think we might want this merged sooner rather than later.