Revert "Clean up to use ?= instead of if"

This reverts commit 6d1424caaa52f01b0fea2fc8182a2c7fd034b1d2.