Maybe aa8fe8fe was all that was needed to fix the build and we can keep the code with fewer conditionals after all.