minor: reformulate 1020743

attempt to simplify conditional logic