We can remove the hardcoded checks now that these are done below.