As below, it seems like we should be able to eliminate these checks entirely.