We need a couple of semi-obscure things on the master now, let's check for them early rather than have people find out after a long time...