Perhaps these need `ifdef`s instead. To have them all twice makes little sense to me and seems like it would (or could) break in the if/else flow that is being used later.