Clean up primary author conditions a little