Since I'm already clobbering the codebase I've just changed this in all areas where we do this kind of check (except for in the activity router where I've already changed a couple spots in another PR).