Fixed a few loose ends involving the 1 = I refactor.