Some teeny preparatory changes.

Well, one of them isn't that teeny.  It should be fine, but JMC, could you do me a big favor and make sure that something with EFB pokes isn't completely broken?