MAINT: Use "odd" variable to clarify branching in places where it was forgotten