Checking state before proceeding

I need to check that this all compiles properly (my build config isn't suited to lightweight changes like this).  But I think that this is all the checking that we need here.